empathy r1160 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Jun 12 06:52:25 2008
New Revision: 1160
URL: http://svn.gnome.org/viewvc/empathy?rev=1160&view=rev

Log:
Check if there is a publish/subscribe list before adding/removing contacts from them. Fixes bug #537690.


Modified:
   trunk/libempathy/empathy-tp-contact-list.c

Modified: trunk/libempathy/empathy-tp-contact-list.c
==============================================================================
--- trunk/libempathy/empathy-tp-contact-list.c	(original)
+++ trunk/libempathy/empathy-tp-contact-list.c	Thu Jun 12 06:52:25 2008
@@ -843,8 +843,11 @@
 
 	g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list));
 
-	empathy_tp_group_add_member (priv->subscribe, contact, message);
-	if (g_list_find (priv->pendings, contact)) {
+	if (priv->subscribe) {
+		empathy_tp_group_add_member (priv->subscribe, contact, message);
+	}
+
+	if (priv->publish && g_list_find (priv->pendings, contact)) {
 		empathy_tp_group_add_member (priv->publish, contact, message);		
 	}
 }
@@ -858,8 +861,12 @@
 
 	g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list));
 
-	empathy_tp_group_remove_member (priv->subscribe, contact, message);
-	empathy_tp_group_remove_member (priv->publish, contact, message);		
+	if (priv->subscribe) {
+		empathy_tp_group_remove_member (priv->subscribe, contact, message);
+	}
+	if (priv->publish) {
+		empathy_tp_group_remove_member (priv->publish, contact, message);		
+	}
 }
 
 static GList *