diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-06-28 15:58:53 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-06-28 15:58:53 +0800 |
| commit | 5e30d8dcf1b80b6281df6bd872bb4455f28c1b23 (patch) | |
| tree | 70b4b92fd0533a19cf724811ceafb94edc14d2f2 /libempathy/empathy-contact-manager.c | |
| parent | 8ffe9c1d74fa04ed7dfb898a8760469e8df16915 (diff) | |
| parent | 240b54dbfe75e1d24a7619cf22e2ffd3acbb6427 (diff) | |
| download | gsoc2013-empathy-5e30d8dcf1b80b6281df6bd872bb4455f28c1b23.tar gsoc2013-empathy-5e30d8dcf1b80b6281df6bd872bb4455f28c1b23.tar.gz gsoc2013-empathy-5e30d8dcf1b80b6281df6bd872bb4455f28c1b23.tar.bz2 gsoc2013-empathy-5e30d8dcf1b80b6281df6bd872bb4455f28c1b23.tar.lz gsoc2013-empathy-5e30d8dcf1b80b6281df6bd872bb4455f28c1b23.tar.xz gsoc2013-empathy-5e30d8dcf1b80b6281df6bd872bb4455f28c1b23.tar.zst gsoc2013-empathy-5e30d8dcf1b80b6281df6bd872bb4455f28c1b23.zip | |
Merge commit 'elliot/bug-584703-c'
Diffstat (limited to 'libempathy/empathy-contact-manager.c')
| -rw-r--r-- | libempathy/empathy-contact-manager.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index 073424485..7af2bd349 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -87,26 +87,6 @@ contact_manager_groups_changed_cb (EmpathyTpContactList *list, } static void -contact_manager_disconnect_foreach (gpointer key, - gpointer value, - gpointer user_data) -{ - EmpathyTpContactList *list = value; - EmpathyContactManager *manager = user_data; - - /* Disconnect signals from the list */ - g_signal_handlers_disconnect_by_func (list, - contact_manager_members_changed_cb, - manager); - g_signal_handlers_disconnect_by_func (list, - contact_manager_pendings_changed_cb, - manager); - g_signal_handlers_disconnect_by_func (list, - contact_manager_groups_changed_cb, - manager); -} - -static void contact_manager_invalidated_cb (TpProxy *connection, guint domain, gint code, @@ -128,6 +108,30 @@ contact_manager_invalidated_cb (TpProxy *connection, } static void +contact_manager_disconnect_foreach (gpointer key, + gpointer value, + gpointer user_data) +{ + TpConnection *connection = key; + EmpathyTpContactList *list = value; + EmpathyContactManager *manager = user_data; + + /* Disconnect signals from the list */ + g_signal_handlers_disconnect_by_func (list, + contact_manager_members_changed_cb, + manager); + g_signal_handlers_disconnect_by_func (list, + contact_manager_pendings_changed_cb, + manager); + g_signal_handlers_disconnect_by_func (list, + contact_manager_groups_changed_cb, + manager); + g_signal_handlers_disconnect_by_func (connection, + contact_manager_invalidated_cb, + manager); +} + +static void contact_manager_new_connection_cb (EmpathyAccountManager *account_manager, TpConnection *connection, EmpathyContactManager *self) |