Attachment 99092 Details for Bug 77773 – base-contact-list: start using tp_handle_set_to_variant()

[patch] base-contact-list: start using tp_handle_set_to_variant()

0007-base-contact-list-start-using-tp_handle_set_to_varia.patch (text/plain), 3.22 KB, created by Guillaume Desmottes on 2014-05-15 14:25:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-05-15 14:25:22 UTC

Size: 3.22 KB

patch

obsolete

>From 7373c412c4890391913bb6745ab920c243449d4a Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Thu, 15 May 2014 16:17:12 +0200
>Subject: [PATCH 7/7] base-contact-list: start using tp_handle_set_to_variant()
>
>We are still using tp_handle_set_to_array() before calling
>tp_base_connection_dup_contact_attributes(). Not sure if we should have a
>version of this API taking a GVariant as well or not.
>---
> telepathy-glib/base-contact-list.c | 22 +++++++++-------------
> 1 file changed, 9 insertions(+), 13 deletions(-)
>
>diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
>index fd9aeea..b81274d 100644
>--- a/telepathy-glib/base-contact-list.c
>+++ b/telepathy-glib/base-contact-list.c
>@@ -2711,7 +2711,8 @@ tp_base_contact_list_groups_removed (TpBaseContactList *self,
> 
>   if (actually_removed->len > 0)
>     {
>-      GArray *members_arr = tp_handle_set_to_array (old_members);
>+      GVariant *members_variant = tp_handle_set_to_variant (old_members);
>+      g_variant_ref_sink (members_variant);
> 
>       DEBUG ("GroupsRemoved([%u including '%s'])",
>           actually_removed->len,
>@@ -2726,24 +2727,23 @@ tp_base_contact_list_groups_removed (TpBaseContactList *self,
>             self->priv->contact_groups_skeleton,
>             (const gchar * const *) actually_removed->pdata);
> 
>-      if (members_arr->len > 0)
>+      if (g_variant_n_children (members_variant) > 0)
>         {
>           const gchar *empty_strv[] = { NULL };
> 
>           /* we already added NULL to actually_removed, so subtract 1 from its
>            * length */
>-          DEBUG ("GroupsChanged([%u contacts], [], [%u groups])",
>-              members_arr->len, actually_removed->len - 1);
>+          DEBUG ("GroupsChanged([%" G_GSIZE_FORMAT " contacts], [], [%u groups])",
>+              g_variant_n_children (members_variant),
>+              actually_removed->len - 1);
> 
>           if (self->priv->contact_groups_skeleton != NULL)
>             _tp_gdbus_connection_interface_contact_groups1_emit_groups_changed (
>-                self->priv->contact_groups_skeleton,
>-                g_variant_new_fixed_array (G_VARIANT_TYPE_UINT32,
>-                    members_arr->data, members_arr->len, sizeof (TpHandle)),
>+                self->priv->contact_groups_skeleton, members_variant,
>                 empty_strv, (const gchar * const *) actually_removed->pdata);
>         }
> 
>-      g_array_unref (members_arr);
>+      g_variant_unref (members_variant);
>     }
> 
>   tp_handle_set_destroy (old_members);
>@@ -3013,15 +3013,11 @@ tp_base_contact_list_groups_changed (TpBaseContactList *self,
> 
>       if (self->priv->contact_groups_skeleton != NULL)
>         {
>-          GArray *members_arr = tp_handle_set_to_array (contacts);
>-
>           _tp_gdbus_connection_interface_contact_groups1_emit_groups_changed (
>               self->priv->contact_groups_skeleton,
>-              g_variant_new_fixed_array (G_VARIANT_TYPE_UINT32,
>-                    members_arr->data, members_arr->len, sizeof (TpHandle)),
>+              tp_handle_set_to_variant (contacts),
>               (const gchar * const *) really_added->pdata,
>               (const gchar * const *) really_removed->pdata);
>-          g_array_unref (members_arr);
>         }
>     }
> 
>-- 
>1.9.0
>

Actions: View | Splinter Review

Attachments on bug 77773: 99069 | 99070 | 99071 | 99086 | 99087 | 99088 | 99089 | 99090 | 99091 | 99092 | 99142 | 99143 | 99144 | 99307 | 99308

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.