aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliot Fairweather <elliot.fairweather@collabora.co.uk>2009-06-26 21:45:22 +0800
committerElliot Fairweather <elliot.fairweather@collabora.co.uk>2009-06-26 21:45:22 +0800
commitae811044a107035a82cbba64951661494dd33e3a (patch)
tree282e68685ef1fd5363670c9e5c37ba817afab2f9
parentcc548789733a60b077718c022b6b0e03fc793857 (diff)
downloadgsoc2013-empathy-ae811044a107035a82cbba64951661494dd33e3a.tar
gsoc2013-empathy-ae811044a107035a82cbba64951661494dd33e3a.tar.gz
gsoc2013-empathy-ae811044a107035a82cbba64951661494dd33e3a.tar.bz2
gsoc2013-empathy-ae811044a107035a82cbba64951661494dd33e3a.tar.lz
gsoc2013-empathy-ae811044a107035a82cbba64951661494dd33e3a.tar.xz
gsoc2013-empathy-ae811044a107035a82cbba64951661494dd33e3a.tar.zst
gsoc2013-empathy-ae811044a107035a82cbba64951661494dd33e3a.zip
disconnnect from invalidated signal before unreferencing connections
-rw-r--r--libempathy/empathy-contact-manager.c44
1 files changed, 24 insertions, 20 deletions
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index f415ec19f..412087ec0 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)