Attachment 99308 Details for Bug 77773 – [gabble] tp_base_connection_dup_contact_attributes() now takes a TpHandleSet

[patch] [gabble] tp_base_connection_dup_contact_attributes() now takes a TpHandleSet

0001-tp_base_connection_dup_contact_attributes-now-takes-.patch (text/plain), 3.02 KB, created by Guillaume Desmottes on 2014-05-19 08:21:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-05-19 08:21:52 UTC

Size: 3.02 KB

patch

obsolete

>From 0371fd8b58855c83ebb4377c597a209c08c6eb02 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Mon, 19 May 2014 10:20:30 +0200
>Subject: [PATCH] tp_base_connection_dup_contact_attributes() now takes a
> TpHandleSet
>
>---
> src/conn-addressing.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
>diff --git a/src/conn-addressing.c b/src/conn-addressing.c
>index 842ea67..2363b4f 100644
>--- a/src/conn-addressing.c
>+++ b/src/conn-addressing.c
>@@ -79,8 +79,7 @@ conn_addressing_get_contacts_by_uri (TpSvcConnectionInterfaceAddressing1 *iface,
>   GValue attributes_dbus_glib = G_VALUE_INIT;
>   GVariant *attributes;
>   GHashTable *requested = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
>-  GArray *handles = g_array_sized_new (TRUE, TRUE, sizeof (TpHandle),
>-      g_strv_length ((gchar **) uris));
>+  TpHandleSet *handles = tp_handle_set_new (contact_repo);
> 
>   for (uri = uris; *uri != NULL; uri++)
>     {
>@@ -90,7 +89,7 @@ conn_addressing_get_contacts_by_uri (TpSvcConnectionInterfaceAddressing1 *iface,
>         continue;
> 
>       g_hash_table_insert (requested, g_strdup (*uri), GUINT_TO_POINTER (h));
>-      g_array_append_val (handles, h);
>+      tp_handle_set_add (handles, h);
>     }
> 
>   attributes = tp_base_connection_dup_contact_attributes (base, handles,
>@@ -100,7 +99,7 @@ conn_addressing_get_contacts_by_uri (TpSvcConnectionInterfaceAddressing1 *iface,
>   tp_svc_connection_interface_addressing1_return_from_get_contacts_by_uri (
>       context, requested, g_value_get_boxed (&attributes_dbus_glib));
> 
>-  g_array_unref (handles);
>+  tp_handle_set_destroy (handles);
>   g_hash_table_unref (requested);
>   g_value_unset (&attributes_dbus_glib);
>   g_variant_unref (attributes);
>@@ -120,8 +119,7 @@ conn_addressing_get_contacts_by_vcard_field (TpSvcConnectionInterfaceAddressing1
>   GValue attributes_dbus_glib = G_VALUE_INIT;
>   GVariant *attributes;
>   GHashTable *requested = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
>-  GArray *handles = g_array_sized_new (TRUE, TRUE, sizeof (TpHandle),
>-      g_strv_length ((gchar **) addresses));
>+  TpHandleSet *handles = tp_handle_set_new (contact_repo);
> 
>   for (address = addresses; *address != NULL; address++)
>     {
>@@ -132,7 +130,7 @@ conn_addressing_get_contacts_by_vcard_field (TpSvcConnectionInterfaceAddressing1
>         continue;
> 
>       g_hash_table_insert (requested, g_strdup (*address), GUINT_TO_POINTER (h));
>-      g_array_append_val (handles, h);
>+      tp_handle_set_add (handles, h);
>     }
> 
>   attributes = tp_base_connection_dup_contact_attributes (base, handles,
>@@ -142,7 +140,7 @@ conn_addressing_get_contacts_by_vcard_field (TpSvcConnectionInterfaceAddressing1
>   tp_svc_connection_interface_addressing1_return_from_get_contacts_by_vcard_field (
>       context, requested, g_value_get_boxed (&attributes_dbus_glib));
> 
>-  g_array_unref (handles);
>+  tp_handle_set_destroy (handles);
>   g_hash_table_unref (requested);
>   g_value_unset (&attributes_dbus_glib);
>   g_variant_unref (attributes);
>-- 
>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.