diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-01-22 20:35:35 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-01-22 20:35:35 +0800 |
| commit | 07961d71bdc15756e355c701a02856dbcd801bdd (patch) | |
| tree | ffd9e4b7d03c29382cdd39818d9c20401fdf9aa0 /src/empathy.c | |
| parent | 90d96b199a4f4e1912403d52f38581e8c86752a1 (diff) | |
| download | gsoc2013-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/empathy.c')
| -rw-r--r-- | src/empathy.c | 12 |
1 files changed, 7 insertions, 5 deletions
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) { |