diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2009-01-10 00:16:08 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2009-01-10 00:16:08 +0800 |
| commit | 1b913b3382ca9abcacba7082be0ffd266a4fd233 (patch) | |
| tree | cfc88b773e72fa03a939ff2a0edbdcca776d9be1 /libempathy-gtk/empathy-chat.c | |
| parent | fae79ace4be2f1d6106b2977584fe6813cfb54c6 (diff) | |
| download | gsoc2013-empathy-1b913b3382ca9abcacba7082be0ffd266a4fd233.tar gsoc2013-empathy-1b913b3382ca9abcacba7082be0ffd266a4fd233.tar.gz gsoc2013-empathy-1b913b3382ca9abcacba7082be0ffd266a4fd233.tar.bz2 gsoc2013-empathy-1b913b3382ca9abcacba7082be0ffd266a4fd233.tar.lz gsoc2013-empathy-1b913b3382ca9abcacba7082be0ffd266a4fd233.tar.xz gsoc2013-empathy-1b913b3382ca9abcacba7082be0ffd266a4fd233.tar.zst gsoc2013-empathy-1b913b3382ca9abcacba7082be0ffd266a4fd233.zip | |
Only show pending messages after the log and explain why show_pending_messages is there when tp-chat gets set
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@2201 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy-gtk/empathy-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 00906ae80..bb7db87da 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -1357,8 +1357,6 @@ chat_create_ui (EmpathyChat *chat) /* Add the main widget in the chat widget */ gtk_container_add (GTK_CONTAINER (chat), priv->widget); - - show_pending_messages (chat); } static void @@ -1456,6 +1454,7 @@ chat_constructed (GObject *object) chat_create_ui (chat); chat_add_logs (chat); + show_pending_messages (chat); } static void @@ -1650,7 +1649,10 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, g_object_notify (G_OBJECT (chat), "id"); g_object_notify (G_OBJECT (chat), "account"); - show_pending_messages (chat); + /* This is a noop when tp-chat is set at object construction time and causes + * the pending messages to be show when it's set on the object after it has + * been created */ + show_pending_messages (chat); } McAccount * |