diff options
| author | Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> | 2009-07-02 22:15:13 +0800 |
|---|---|---|
| committer | Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> | 2009-07-02 22:15:13 +0800 |
| commit | 5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3 (patch) | |
| tree | 8cd15d24cebb2030abddbd8f0d43b10f9a3ce050 | |
| parent | 5af5dedd2bd5a57f700d3abf7a326d0462494caa (diff) | |
| parent | f923e5ed0d36621b580061dbaff834ec7e7ee0bc (diff) | |
| download | gsoc2013-empathy-5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3.tar gsoc2013-empathy-5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3.tar.gz gsoc2013-empathy-5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3.tar.bz2 gsoc2013-empathy-5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3.tar.lz gsoc2013-empathy-5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3.tar.xz gsoc2013-empathy-5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3.tar.zst gsoc2013-empathy-5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3.zip | |
Merge branch 'fix-585601'
| -rw-r--r-- | libempathy-gtk/empathy-chat-text-view.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c index 5ed7c69c3..abe1fc1f3 100644 --- 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 1f1b3b06d..aab1f6f3d 100644 --- 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 |