diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-01-21 20:05:33 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-01-22 19:58:40 +0800 |
| commit | 7ed6676eb0dc2c05718774fbc1939d6a8a5c6445 (patch) | |
| tree | ccd36e78c05e27dd39eccedf0835fe359131536e | |
| parent | f6d60f33a0ab2af025e7d13a8dea9a93c6eab3f9 (diff) | |
| download | gsoc2013-empathy-7ed6676eb0dc2c05718774fbc1939d6a8a5c6445.tar gsoc2013-empathy-7ed6676eb0dc2c05718774fbc1939d6a8a5c6445.tar.gz gsoc2013-empathy-7ed6676eb0dc2c05718774fbc1939d6a8a5c6445.tar.bz2 gsoc2013-empathy-7ed6676eb0dc2c05718774fbc1939d6a8a5c6445.tar.lz gsoc2013-empathy-7ed6676eb0dc2c05718774fbc1939d6a8a5c6445.tar.xz gsoc2013-empathy-7ed6676eb0dc2c05718774fbc1939d6a8a5c6445.tar.zst gsoc2013-empathy-7ed6676eb0dc2c05718774fbc1939d6a8a5c6445.zip | |
empathy-import-widget: use empathy_connection_managers_call_when_ready
| -rw-r--r-- | 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 5a0d82c8c..915db533e 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 |