allow got_list_channel to be called more than once for the same channel

Also allow to pass other list channel such as 'deny' for example.

1 files changed, 6 insertions, 2 deletions

diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 2f2717b44..1b8f11679 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -710,19 +710,23 @@ got_list_channel (EmpathyTpContactList *list,
 
 	/* TpChannel emits initial set of members just before being ready */
 	if (!tp_strdiff (id, "stored")) {
+		if (priv->stored != NULL)
+			return;
 		priv->stored = g_object_ref (channel);
 	} else if (!tp_strdiff (id, "publish")) {
+		if (priv->publish != NULL)
+			return;
 		priv->publish = g_object_ref (channel);
 		g_signal_connect (priv->publish, "group-members-changed",
 				  G_CALLBACK (tp_contact_list_publish_group_members_changed_cb),
 				  list);
 	} else if (!tp_strdiff (id, "subscribe")) {
+		if (priv->subscribe != NULL)
+			return;
 		priv->subscribe = g_object_ref (channel);
 		g_signal_connect (priv->subscribe, "group-members-changed",
 				  G_CALLBACK (tp_contact_list_subscribe_group_members_changed_cb),
 				  list);
-	} else {
-		g_warn_if_reached ();
 	}
 }