aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
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 /libempathy-gtk
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 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 0dc60d4eb..86f6af57b 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -253,13 +253,14 @@ protocol_chooser_add_cms_list (EmpathyProtocolChooser *protocol_chooser,
}
static void
-protocol_chooser_cms_ready_cb (EmpathyConnectionManagers *cms,
- const GError *error,
+protocol_chooser_cms_prepare_cb (GObject *source,
+ GAsyncResult *result,
gpointer user_data)
{
+ EmpathyConnectionManagers *cms = EMPATHY_CONNECTION_MANAGERS (source);
EmpathyProtocolChooser *protocol_chooser = user_data;
- if (error != NULL)
+ if (!empathy_connection_managers_prepare_finish (cms, result, NULL))
return;
protocol_chooser_add_cms_list (protocol_chooser,
@@ -309,8 +310,8 @@ protocol_chooser_constructed (GObject *object)
"text", COL_LABEL,
NULL);
- empathy_connection_managers_call_when_ready (priv->cms,
- protocol_chooser_cms_ready_cb, protocol_chooser);
+ empathy_connection_managers_prepare_async (priv->cms,
+ protocol_chooser_cms_prepare_cb, protocol_chooser);
if (G_OBJECT_CLASS (empathy_protocol_chooser_parent_class)->constructed)
G_OBJECT_CLASS