[next] telepathy-gabble: Adapt for GVariant-based tp_group_mixin_change_members()

Simon McVittie smcv at kemper.freedesktop.org
Thu Apr 10 07:02:19 PDT 2014


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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Apr  9 19:22:08 2014 +0100

Adapt for GVariant-based tp_group_mixin_change_members()

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

---

 src/muc-channel.c |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/muc-channel.c b/src/muc-channel.c
index 7ccef6e..d3087ad 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -356,20 +356,22 @@ change_members (GObject *obj,
     TpHandle actor,
     TpChannelGroupChangeReason reason)
 {
-  GHashTable *details;
+  GVariantDict details;
 
-  details = tp_asv_new (
-      "actor", G_TYPE_UINT, actor,
-      "change-reason", G_TYPE_UINT, reason,
-      NULL);
+  g_variant_dict_init (&details, NULL);
+
+  g_variant_dict_insert_value (&details, "actor",
+      g_variant_new_uint32 (actor));
+  g_variant_dict_insert_value (&details, "change-reason",
+      g_variant_new_uint32 (reason));
 
   if (message != NULL)
-    tp_asv_set_string (details, "message", message);
+    g_variant_dict_insert_value (&details, "message",
+        g_variant_new_string (message));
 
   tp_group_mixin_change_members (obj,
-      add, del, add_local_pending, add_remote_pending, details);
-
-  g_hash_table_unref (details);
+      add, del, add_local_pending, add_remote_pending,
+      g_variant_dict_end (&details));
 }
 
 static void



More information about the telepathy-commits mailing list