empathy r2201 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan  9 16:16:08 2009
New Revision: 2201
URL: http://svn.gnome.org/viewvc/empathy?rev=2201&view=rev

Log:
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>

Modified:
   trunk/libempathy-gtk/empathy-chat.c

Modified: trunk/libempathy-gtk/empathy-chat.c
==============================================================================
--- trunk/libempathy-gtk/empathy-chat.c	(original)
+++ trunk/libempathy-gtk/empathy-chat.c	Fri Jan  9 16:16:08 2009
@@ -1357,8 +1357,6 @@
 
 	/* 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_create_ui (chat);
 	chat_add_logs (chat);
+	show_pending_messages (chat);
 }
 
 static void
@@ -1650,7 +1649,10 @@
 	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 *