diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-09 19:22:32 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-09 19:22:32 +0100 |
| commit | 10ad96769d23a5bf9b59dae96673397f7fa274b2 (patch) | |
| tree | 8692c2486f06624fa1cc854e525f626fd3c207c4 | |
| parent | 3a8a93f39ec3cda86adeaa31b26c0bcdfd2084a0 (diff) | |
Adapt for GVariant-based tp_group_mixin_change_members()group-mixin
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77190
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/muc-channel.c | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 1b4b69e9..7f1be0ab 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 46a65310..1433d971 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 |