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

[Simon McVittie]

Module: telepathy-salut
Branch: next
Commit: 10ad96769d23a5bf9b59dae96673397f7fa274b2
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=10ad96769d23a5bf9b59dae96673397f7fa274b2

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

Adapt for GVariant-based tp_group_mixin_change_members()

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

---

 configure.ac      |    6 +++---
 src/muc-channel.c |   20 +++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1b4b69e..7f1be0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,11 +137,11 @@ GTK_DOC_CHECK
 
 dnl Check for Glib
 PKG_CHECK_MODULES(GLIB,
-    [glib-2.0 >= 2.32.0, gobject-2.0 >= 2.32.0, gthread-2.0 >= 2.32.0, gio-2.0 >= 2.32.0])
+    [glib-2.0 >= 2.40, gobject-2.0 >= 2.40, gthread-2.0 >= 2.40, gio-2.0 >= 2.40])
 
 dnl MIN_REQUIRED must stay to 2.30 because of GValueArray
-AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.32 deprecations])
-AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32], [Prevent post 2.32 APIs])
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_40], [Prevent post 2.40 APIs])
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 46a6531..1433d97 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -194,20 +194,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