aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-22 20:35:35 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-22 20:35:35 +0800
commit07961d71bdc15756e355c701a02856dbcd801bdd (patch)
treeffd9e4b7d03c29382cdd39818d9c20401fdf9aa0 /src
parent90d96b199a4f4e1912403d52f38581e8c86752a1 (diff)
downloadgsoc2013-empathy-07961d71bdc15756e355c701a02856dbcd801bdd.tar
gsoc2013-empathy-07961d71bdc15756e355c701a02856dbcd801bdd.tar.gz
gsoc2013-empathy-07961d71bdc15756e355c701a02856dbcd801bdd.tar.bz2
gsoc2013-empathy-07961d71bdc15756e355c701a02856dbcd801bdd.tar.lz
gsoc2013-empathy-07961d71bdc15756e355c701a02856dbcd801bdd.tar.xz
gsoc2013-empathy-07961d71bdc15756e355c701a02856dbcd801bdd.tar.zst
gsoc2013-empathy-07961d71bdc15756e355c701a02856dbcd801bdd.zip
replace empathy_connection_managers_call_when_ready by prepare_{async_finish} functions
Diffstat (limited to 'src')
-rw-r--r--src/empathy-import-widget.c11
-rw-r--r--src/empathy.c12
2 files changed, 13 insertions, 10 deletions
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 915db533e..a5bc0ef24 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -334,13 +334,14 @@ import_widget_set_up_account_list (EmpathyImportWidget *self)
}
static void
-import_widget_cms_ready_cb (EmpathyConnectionManagers *cms,
- const GError *error,
+import_widget_cms_prepare_cb (GObject *source,
+ GAsyncResult *result,
gpointer user_data)
{
EmpathyImportWidget *self = user_data;
- if (error != NULL)
+ if (!empathy_connection_managers_prepare_finish (
+ EMPATHY_CONNECTION_MANAGERS (source), result, NULL))
return;
import_widget_set_up_account_list (self);
@@ -442,8 +443,8 @@ do_constructed (GObject *obj)
g_signal_connect (priv->vbox, "destroy",
G_CALLBACK (import_widget_destroy_cb), self);
- empathy_connection_managers_call_when_ready (priv->cms,
- import_widget_cms_ready_cb, self);
+ empathy_connection_managers_prepare_async (priv->cms,
+ import_widget_cms_prepare_cb, self);
}
static void
diff --git a/src/empathy.c b/src/empathy.c
index 5647789c8..7bdea3be9 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -201,11 +201,13 @@ maybe_show_account_assistant (void)
}
static void
-connection_managers_ready_cb (EmpathyConnectionManagers *managers,
- const GError *error,
+connection_managers_prepare_cb (GObject *source,
+ GAsyncResult *result,
gpointer user_data)
{
- if (error != NULL)
+ EmpathyConnectionManagers *managers = EMPATHY_CONNECTION_MANAGERS (source);
+
+ if (!empathy_connection_managers_prepare_finish (managers, result, NULL))
goto out;
if (!empathy_import_mc4_accounts (managers) && !start_hidden)
@@ -488,8 +490,8 @@ account_manager_ready_cb (GObject *source_object,
EmpathyConnectionManagers *managers;
managers = empathy_connection_managers_dup_singleton ();
- empathy_connection_managers_call_when_ready (managers,
- connection_managers_ready_cb, NULL);
+ empathy_connection_managers_prepare_async (managers,
+ connection_managers_prepare_cb, NULL);
}
else if (!start_hidden)
{