Attachment 61177 Details for Bug 49371 – channel-contacts.c: reorder members-changed code

[patch] channel-contacts.c: reorder members-changed code

channel-contactsc-reorder-members-changed-code.patch (text/plain), 3.79 KB, created by Xavier Claessens on 2012-05-07 12:54:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Claessens

Created: 2012-05-07 12:54:32 UTC

Size: 3.79 KB

patch

obsolete

>From 1db7dee2d7b54a1c3b8c4a2d76e4f063e90bb72c Mon Sep 17 00:00:00 2001
>From: Xavier Claessens <xavier.claessens@collabora.co.uk>
>Date: Mon, 7 May 2012 16:15:23 +0200
>Subject: [PATCH] channel-contacts.c: reorder members-changed code
>
>Use the same order than in channel-group.c, it will be
>important in a future change
>
>https://bugs.freedesktop.org/show_bug.cgi?id=49371
>---
> telepathy-glib/channel-contacts.c |   64 ++++++++++++++++++-------------------
> 1 file changed, 32 insertions(+), 32 deletions(-)
>
>diff --git a/telepathy-glib/channel-contacts.c b/telepathy-glib/channel-contacts.c
>index 1c79237..54e1b09 100644
>--- a/telepathy-glib/channel-contacts.c
>+++ b/telepathy-glib/channel-contacts.c
>@@ -503,38 +503,6 @@ members_changed_prepared_cb (GObject *object,
> 
>   _tp_channel_contacts_queue_prepare_finish (self, result, NULL, NULL);
> 
>-  /* For removed contacts, we have only handles because we are supposed to
>-   * already know them. So we have to search them in our tables, construct an
>-   * array of removed contacts and then remove them from our tables */
>-  removed = g_ptr_array_new_full (data->removed->len, g_object_unref);
>-  for (i = 0; i < data->removed->len; i++)
>-    {
>-      TpHandle handle = g_array_index (data->removed, TpHandle, i);
>-      gpointer key = GUINT_TO_POINTER (handle);
>-      TpContact *contact;
>-
>-      contact = g_hash_table_lookup (self->priv->group_members_contacts, key);
>-      if (contact == NULL)
>-          contact = g_hash_table_lookup (
>-              self->priv->group_local_pending_contacts, key);
>-      if (contact == NULL)
>-          contact = g_hash_table_lookup (
>-              self->priv->group_remote_pending_contacts, key);
>-
>-      if (contact == NULL)
>-        {
>-          DEBUG ("Handle %u removed but not found in our tables - broken CM",
>-              handle);
>-          continue;
>-        }
>-
>-      g_ptr_array_add (removed, g_object_ref (contact));
>-
>-      g_hash_table_remove (self->priv->group_members_contacts, key);
>-      g_hash_table_remove (self->priv->group_local_pending_contacts, key);
>-      g_hash_table_remove (self->priv->group_remote_pending_contacts, key);
>-    }
>-
>   for (i = 0; i < data->added->len; i++)
>     {
>       TpContact *contact = g_ptr_array_index (data->added, i);
>@@ -577,6 +545,38 @@ members_changed_prepared_cb (GObject *object,
>           g_object_ref (contact));
>     }
> 
>+  /* For removed contacts, we have only handles because we are supposed to
>+   * already know them. So we have to search them in our tables, construct an
>+   * array of removed contacts and then remove them from our tables */
>+  removed = g_ptr_array_new_full (data->removed->len, g_object_unref);
>+  for (i = 0; i < data->removed->len; i++)
>+    {
>+      TpHandle handle = g_array_index (data->removed, TpHandle, i);
>+      gpointer key = GUINT_TO_POINTER (handle);
>+      TpContact *contact;
>+
>+      contact = g_hash_table_lookup (self->priv->group_members_contacts, key);
>+      if (contact == NULL)
>+          contact = g_hash_table_lookup (
>+              self->priv->group_local_pending_contacts, key);
>+      if (contact == NULL)
>+          contact = g_hash_table_lookup (
>+              self->priv->group_remote_pending_contacts, key);
>+
>+      if (contact == NULL)
>+        {
>+          DEBUG ("Handle %u removed but not found in our tables - broken CM",
>+              handle);
>+          continue;
>+        }
>+
>+      g_ptr_array_add (removed, g_object_ref (contact));
>+
>+      g_hash_table_remove (self->priv->group_members_contacts, key);
>+      g_hash_table_remove (self->priv->group_local_pending_contacts, key);
>+      g_hash_table_remove (self->priv->group_remote_pending_contacts, key);
>+    }
>+
>   g_signal_emit_by_name (self, "group-contacts-changed", data->added,
>       removed, data->local_pending, data->remote_pending, data->actor,
>       data->details);
>-- 
>1.7.9.5

Actions: View | Splinter Review

Attachments on bug 49371: 61177 | 61178 | 61179 | 61180 | 61181 | 61182 | 61183 | 61184 | 61185 | 61186 | 61187 | 61338 | 61339 | 61340 | 61341 | 61342 | 61343 | 61344 | 61345 | 61346 | 61347 | 61348

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.