Merge branch 'fix-585601'

diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index 5ed7c69c3e99e0eeb7ba9f8ac1f707d9e1ea2bf2..abe1fc1f3a1fea9164185fb96d35421ff611371f 100644 (file)
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -817,6 +817,10 @@ chat_text_view_clear (EmpathyChatView *view)
        priv = GET_PRIV (view);
 
        priv->last_timestamp = 0;
+       if (priv->last_contact) {
+               g_object_unref (priv->last_contact);
+               priv->last_contact = NULL;
+       }
 }
 
 static gboolean

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 1f1b3b06d906ce457a581b045588867d28001b70..aab1f6f3ddfc583600ed47c6a28fc9166c84a106 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -564,6 +564,13 @@ theme_adium_clear (EmpathyChatView *view)
                                          priv->data->template_html,
                                          basedir_uri);
        g_free (basedir_uri);
+
+       /* Clear last contact to avoid trying to add a 'joined'
+        * message when we don't have an insertion point. */
+       if (priv->last_contact) {
+               g_object_unref (priv->last_contact);
+               priv->last_contact = NULL;
+       }
 }
 
 static gboolean