Don't own a reference to the EmpathyTpChat, otherwise it won't be

finalized.

svn path=/trunk/; revision=2063

diff --git a/libempathy/empathy-contact-monitor.c b/libempathy/empathy-contact-monitor.c
index 04a384bbf8794e1d94dfd943a884876fe66107f3..8cd55d9321ceb3828d6123ddf499744e465d73c4 100644 (file)
--- a/libempathy/empathy-contact-monitor.c
+++ b/libempathy/empathy-contact-monitor.c
@@ -55,6 +55,13 @@ enum {
 
 static void  contact_remove_foreach (EmpathyContact *contact,
                                     EmpathyContactMonitor *monitor);
+static void  cl_members_changed_cb  (EmpathyContactList    *cl,
+                                    EmpathyContact        *contact,
+                                    EmpathyContact        *actor,
+                                    guint                  reason,
+                                    gchar                 *message,
+                                    gboolean               is_member,
+                                    EmpathyContactMonitor *monitor);
 
 static guint signals[LAST_SIGNAL];
 
@@ -102,7 +109,7 @@ do_finalize (GObject *obj)
        EmpathyContactMonitorPriv *priv;
 
        priv = GET_PRIV (obj);
-
+       
        if (priv->contacts) {
                g_ptr_array_foreach (priv->contacts,
                                     (GFunc) contact_remove_foreach, obj);
@@ -110,6 +117,11 @@ do_finalize (GObject *obj)
                priv->contacts = NULL;
        }
 
+       if (priv->proxy) {
+               g_signal_handlers_disconnect_by_func (priv->proxy,
+                                                     cl_members_changed_cb, obj);
+       }
+
        G_OBJECT_CLASS (empathy_contact_monitor_parent_class)->finalize (obj);
 }
 
@@ -370,12 +382,7 @@ empathy_contact_monitor_set_proxy (EmpathyContactMonitor *self,
                priv->contacts = NULL;
        }
 
-       if (priv->proxy != NULL) {
-               g_object_unref (priv->proxy);
-               priv->proxy = NULL;
-       }
-
-       priv->proxy = g_object_ref (proxy);
+       priv->proxy = proxy;
        priv->contacts = g_ptr_array_new ();
 
        g_signal_connect (proxy, "members-changed",