Merge commit 'elliot/bug-584703-c'

2 files changed, 38 insertions, 20 deletions

diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index dd0a72f59..ff9fd2525 100644
--- a/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@ -505,12 +505,26 @@ empathy_account_manager_init (EmpathyAccountManager *manager)
 }
 
 static void
+account_manager_disconnect_foreach (gpointer key,
+                                    gpointer value,
+                                    gpointer user_data)
+{
+  TpConnection *connection = key;
+  EmpathyAccountManager *manager = user_data;
+
+  g_signal_handlers_disconnect_by_func (connection, connection_invalidated_cb,
+    manager);
+}
+
+static void
 do_finalize (GObject *obj)
 {
   EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj);
   EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
 
   g_hash_table_unref (priv->accounts);
+  g_hash_table_foreach (priv->connections, account_manager_disconnect_foreach,
+    obj);
   g_hash_table_unref (priv->connections);
 
   G_OBJECT_CLASS (empathy_account_manager_parent_class)->finalize (obj);
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)