empathy r761 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Mar 11 12:22:48 2008
New Revision: 761
URL: http://svn.gnome.org/viewvc/empathy?rev=761&view=rev

Log:
Don't wait for connection-ready if it was already ready.


Modified:
   trunk/libempathy/empathy-tp-contact-factory.c

Modified: trunk/libempathy/empathy-tp-contact-factory.c
==============================================================================
--- trunk/libempathy/empathy-tp-contact-factory.c	(original)
+++ trunk/libempathy/empathy-tp-contact-factory.c	Tue Mar 11 12:22:48 2008
@@ -829,6 +829,7 @@
 {
 	EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
 	TpConn                      *tp_conn;
+	gboolean                     connection_ready;
 
 	if (priv->connection) {
 		/* We already have our connection object */
@@ -847,9 +848,15 @@
 	g_signal_connect_swapped (priv->connection, "invalidated",
 				  G_CALLBACK (tp_contact_factory_connection_invalidated_cb),
 				  tp_factory);
-	g_signal_connect_swapped (priv->connection, "notify::connection-ready",
-				  G_CALLBACK (tp_contact_factory_connection_ready_cb),
-				  tp_factory);
+
+	g_object_get (priv->connection, "connection-ready", &connection_ready, NULL);
+	if (connection_ready) {
+		tp_contact_factory_connection_ready_cb (tp_factory);
+	} else {
+		g_signal_connect_swapped (priv->connection, "notify::connection-ready",
+					  G_CALLBACK (tp_contact_factory_connection_ready_cb),
+					  tp_factory);
+	}
 }
 
 static void
@@ -1195,6 +1202,7 @@
 	g_list_free (priv->contacts);
 	g_object_unref (priv->mc);
 	g_object_unref (priv->account);
+	g_object_unref (priv->user);
 
 	if (priv->connection) {
 		g_object_unref (priv->connection);