aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-01-10 00:16:08 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-10 00:16:08 +0800
commitecb7dddc52d4f7b52b31d01afdf1ac457e8f854d (patch)
treecfc88b773e72fa03a939ff2a0edbdcca776d9be1 /libempathy-gtk
parent702870d6d81ef54dc33bed04b34c6b5a89c597d9 (diff)
downloadgsoc2013-empathy-ecb7dddc52d4f7b52b31d01afdf1ac457e8f854d.tar
gsoc2013-empathy-ecb7dddc52d4f7b52b31d01afdf1ac457e8f854d.tar.gz
gsoc2013-empathy-ecb7dddc52d4f7b52b31d01afdf1ac457e8f854d.tar.bz2
gsoc2013-empathy-ecb7dddc52d4f7b52b31d01afdf1ac457e8f854d.tar.lz
gsoc2013-empathy-ecb7dddc52d4f7b52b31d01afdf1ac457e8f854d.tar.xz
gsoc2013-empathy-ecb7dddc52d4f7b52b31d01afdf1ac457e8f854d.tar.zst
gsoc2013-empathy-ecb7dddc52d4f7b52b31d01afdf1ac457e8f854d.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> svn path=/trunk/; revision=2201
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-chat.c8
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 *