[next] telepathy-rakia: Update to GVariantDict-based fill_contact_attributes

[Simon McVittie]

Module: telepathy-rakia
Branch: next
Commit: fc38bd003a17ef4334ebbfe7f5d7c975a0b13cd7
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=fc38bd003a17ef4334ebbfe7f5d7c975a0b13cd7

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr 22 14:42:32 2014 +0100

Update to GVariantDict-based fill_contact_attributes

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77189

---

 rakia/connection-aliasing.c |   18 ++++++++----------
 rakia/connection-aliasing.h |    2 +-
 src/sip-connection.c        |    2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/rakia/connection-aliasing.c b/rakia/connection-aliasing.c
index 5c2d55f..715fa6e 100644
--- a/rakia/connection-aliasing.c
+++ b/rakia/connection-aliasing.c
@@ -284,23 +284,21 @@ gboolean
 rakia_conn_aliasing_fill_contact_attributes (TpBaseConnection *base,
     const gchar *dbus_interface,
     TpHandle handle,
-    TpContactAttributeMap *attributes)
+    GVariantDict *attributes)
 {
   if (!tp_strdiff (dbus_interface, TP_IFACE_CONNECTION_INTERFACE_ALIASING1))
     {
       TpHandleRepoIface *contact_handles;
-      GValue *val;
+      gchar *alias;
 
       contact_handles = tp_base_connection_get_handles (base,
           TP_ENTITY_TYPE_CONTACT);
-
-      val = tp_g_value_slice_new (G_TYPE_STRING);
-
-      g_value_take_string (val,
-          conn_get_alias (base, contact_handles, handle));
-
-      tp_contact_attribute_map_take_sliced_gvalue (attributes, handle,
-          TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS, val);
+      alias = conn_get_alias (base, contact_handles, handle);
+      g_assert (alias != NULL);
+      g_variant_dict_insert_value (attributes,
+          TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS,
+          g_variant_new_string (alias));
+      g_free (alias);
       return TRUE;
     }
 
diff --git a/rakia/connection-aliasing.h b/rakia/connection-aliasing.h
index d933e11..7bf4ed6 100644
--- a/rakia/connection-aliasing.h
+++ b/rakia/connection-aliasing.h
@@ -56,7 +56,7 @@ void rakia_connection_aliasing_svc_iface_init (gpointer g_iface,
 gboolean rakia_conn_aliasing_fill_contact_attributes (TpBaseConnection *base,
     const gchar *dbus_interface,
     TpHandle handle,
-    TpContactAttributeMap *attributes);
+    GVariantDict *attributes);
 
 G_END_DECLS
 
diff --git a/src/sip-connection.c b/src/sip-connection.c
index c8cd447..ed70320 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -451,7 +451,7 @@ static void
 rakia_connection_fill_contact_attributes (TpBaseConnection *base,
     const gchar *dbus_interface,
     TpHandle handle,
-    TpContactAttributeMap *attributes)
+    GVariantDict *attributes)
 {
   if (rakia_conn_aliasing_fill_contact_attributes (base,
         dbus_interface, handle, attributes))