diff options
author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-16 06:28:46 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-16 06:28:46 +0800 |
commit | a17ae72f50370e70a8f231b4d24361d448402b20 (patch) | |
tree | 4154058b33ae5f8048f6ffbf40b6d56a43d347ce /libempathy/empathy-tp-call.c | |
parent | b68b95efe92023193c318d4dd0fb92544463adef (diff) | |
download | gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.gz gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.bz2 gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.lz gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.xz gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.zst gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.zip |
Cleanup code from previous merge
svn path=/trunk/; revision=638
Diffstat (limited to 'libempathy/empathy-tp-call.c')
-rw-r--r-- | libempathy/empathy-tp-call.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c index 4ec4a97ff..7deb31c25 100644 --- a/libempathy/empathy-tp-call.c +++ b/libempathy/empathy-tp-call.c @@ -327,13 +327,14 @@ tp_call_request_streams_for_capabilities (EmpathyTpCall *call, static void tp_call_request_streams_capabilities_cb (EmpathyContact *contact, - GParamSpec *property, gpointer user_data) + GParamSpec *property, + gpointer user_data) { EmpathyTpCall *call = EMPATHY_TP_CALL (user_data); g_signal_handlers_disconnect_by_func (contact, - tp_call_request_streams_capabilities_cb, - user_data); + tp_call_request_streams_capabilities_cb, + user_data); tp_call_request_streams_for_capabilities (call, empathy_contact_get_capabilities (contact)); @@ -361,11 +362,12 @@ tp_call_request_streams (EmpathyTpCall *call) else { capabilities = empathy_contact_get_capabilities (priv->contact); - if (capabilities == EMPATHY_CAPABILITIES_UNKNOWN) { - g_signal_connect (G_OBJECT (priv->contact), "notify::capabilities", - G_CALLBACK (tp_call_request_streams_capabilities_cb), call); - return; - } + if (capabilities == EMPATHY_CAPABILITIES_UNKNOWN) + { + g_signal_connect (priv->contact, "notify::capabilities", + G_CALLBACK (tp_call_request_streams_capabilities_cb), call); + return; + } } tp_call_request_streams_for_capabilities (call, capabilities); |