[next] telepathy-glib: tp_base_contact_list_set_list_received: don' t re-announce groups

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: 0b88229dc8439a37c69fc3e6544119201d7d4c48
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=0b88229dc8439a37c69fc3e6544119201d7d4c48

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Jan  3 11:02:52 2013 +0000

tp_base_contact_list_set_list_received: don't re-announce groups

We already announced each group from tp_base_contact_list_groups_created
a few lines ago; we don't need to do it again.

Ideally we'd add each channel's members before announcing the
channel itself, so that the channel is created "fully-formed"; but
we've never actually done that, and keeping the first NewChannels
instead of the second seems less likely to break applications.
These channels are only for legacy code anyway: any modern client
should be using the ContactGroups interface.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=52011
Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>

---

 telepathy-glib/base-contact-list.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
index 7e62753..d24e5ce 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -2008,8 +2008,6 @@ tp_base_contact_list_set_list_received (TpBaseContactList *self)
   if (TP_IS_CONTACT_GROUP_LIST (self))
     {
       GStrv groups = tp_base_contact_list_dup_groups (self);
-      GHashTableIter h_iter;
-      gpointer channel;
 
       tp_base_contact_list_groups_created (self,
           (const gchar * const *) groups, -1);
@@ -2024,11 +2022,6 @@ tp_base_contact_list_set_list_received (TpBaseContactList *self)
           tp_handle_set_destroy (members);
         }
 
-      g_hash_table_iter_init (&h_iter, self->priv->groups);
-
-      while (g_hash_table_iter_next (&h_iter, NULL, &channel))
-        tp_base_contact_list_announce_channel (self, channel, NULL);
-
       g_strfreev (groups);
     }