empathy r2205 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan  9 16:16:20 2009
New Revision: 2205
URL: http://svn.gnome.org/viewvc/empathy?rev=2205&view=rev

Log:
Only unref things in dispose

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/libempathy/empathy-tp-chat.c

Modified: trunk/libempathy/empathy-tp-chat.c
==============================================================================
--- trunk/libempathy/empathy-tp-chat.c	(original)
+++ trunk/libempathy/empathy-tp-chat.c	Fri Jan  9 16:16:20 2009
@@ -924,6 +924,10 @@
 		g_object_unref (priv->account);
 	priv->account = NULL;
 
+	if (priv->contact_monitor)
+		g_object_unref (priv->contact_monitor);
+	priv->contact_monitor = NULL;
+
 	if (!g_queue_is_empty (priv->messages_queue)) {
 		EmpathyMessage *message;
 		EmpathyContact *contact;
@@ -966,20 +970,7 @@
 		g_ptr_array_free (priv->properties, TRUE);
 	}
 
-	if (priv->remote_contact) {
-		g_object_unref (priv->remote_contact);
-	}
-	if (priv->group) {
-		g_object_unref (priv->group);
-	}
-
-	if (priv->contact_monitor) {
-		g_object_unref (priv->contact_monitor);
-	}
 
-	g_object_unref (priv->factory);
-	g_object_unref (priv->user);
-	g_object_unref (priv->account);
 	g_free (priv->id);
 	g_queue_free (priv->messages_queue);
 	g_queue_free (priv->pending_messages_queue);