diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-01-21 20:23:50 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-01-22 19:58:40 +0800 |
| commit | 90d96b199a4f4e1912403d52f38581e8c86752a1 (patch) | |
| tree | 9cb550c7c4f3f092cd7cc8024a75f16668240081 /libempathy-gtk | |
| parent | 61caee80d36af8064a9c0953ce4ee7123bf6115d (diff) | |
| download | gsoc2013-empathy-90d96b199a4f4e1912403d52f38581e8c86752a1.tar gsoc2013-empathy-90d96b199a4f4e1912403d52f38581e8c86752a1.tar.gz gsoc2013-empathy-90d96b199a4f4e1912403d52f38581e8c86752a1.tar.bz2 gsoc2013-empathy-90d96b199a4f4e1912403d52f38581e8c86752a1.tar.lz gsoc2013-empathy-90d96b199a4f4e1912403d52f38581e8c86752a1.tar.xz gsoc2013-empathy-90d96b199a4f4e1912403d52f38581e8c86752a1.tar.zst gsoc2013-empathy-90d96b199a4f4e1912403d52f38581e8c86752a1.zip | |
empathy-protocol-chooser: use empathy_connection_managers_call_when_ready
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-protocol-chooser.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c index 7b706b05d..0dc60d4eb 100644 --- a/libempathy-gtk/empathy-protocol-chooser.c +++ b/libempathy-gtk/empathy-protocol-chooser.c @@ -254,12 +254,16 @@ protocol_chooser_add_cms_list (EmpathyProtocolChooser *protocol_chooser, static void protocol_chooser_cms_ready_cb (EmpathyConnectionManagers *cms, - GParamSpec *pspec, - EmpathyProtocolChooser *protocol_chooser) + const GError *error, + gpointer user_data) { - if (empathy_connection_managers_is_ready (cms)) - protocol_chooser_add_cms_list - (protocol_chooser, empathy_connection_managers_get_cms (cms)); + EmpathyProtocolChooser *protocol_chooser = user_data; + + if (error != NULL) + return; + + protocol_chooser_add_cms_list (protocol_chooser, + empathy_connection_managers_get_cms (cms)); } static void @@ -305,12 +309,8 @@ protocol_chooser_constructed (GObject *object) "text", COL_LABEL, NULL); - if (empathy_connection_managers_is_ready (priv->cms)) - protocol_chooser_add_cms_list (protocol_chooser, - empathy_connection_managers_get_cms (priv->cms)); - else - g_signal_connect (priv->cms, "notify::ready", - G_CALLBACK (protocol_chooser_cms_ready_cb), protocol_chooser); + empathy_connection_managers_call_when_ready (priv->cms, + protocol_chooser_cms_ready_cb, protocol_chooser); if (G_OBJECT_CLASS (empathy_protocol_chooser_parent_class)->constructed) G_OBJECT_CLASS |