[empathy] empathy-import-widget: use empathy_connection_managers_call_when_ready



commit 7ed6676eb0dc2c05718774fbc1939d6a8a5c6445
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Jan 21 12:05:33 2010 +0000

    empathy-import-widget: use empathy_connection_managers_call_when_ready

 src/empathy-import-widget.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 5a0d82c..915db53 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -335,11 +335,15 @@ import_widget_set_up_account_list (EmpathyImportWidget *self)
 
 static void
 import_widget_cms_ready_cb (EmpathyConnectionManagers *cms,
-    GParamSpec *pspec,
-    EmpathyImportWidget *self)
+    const GError *error,
+    gpointer user_data)
 {
-  if (empathy_connection_managers_is_ready (cms))
-    import_widget_set_up_account_list (self);
+  EmpathyImportWidget *self = user_data;
+
+  if (error != NULL)
+    return;
+
+  import_widget_set_up_account_list (self);
 }
 
 static void
@@ -438,11 +442,8 @@ do_constructed (GObject *obj)
   g_signal_connect (priv->vbox, "destroy",
       G_CALLBACK (import_widget_destroy_cb), self);
 
-  if (empathy_connection_managers_is_ready (priv->cms))
-    import_widget_set_up_account_list (self);
-  else
-    g_signal_connect (priv->cms, "notify::ready",
-        G_CALLBACK (import_widget_cms_ready_cb), self);
+  empathy_connection_managers_call_when_ready (priv->cms,
+      import_widget_cms_ready_cb, self);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]