telepathy-glib: _tp_asv_to_vardict: use _tp_boxed_to_variant()

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Wed May 2 06:26:15 PDT 2012


Module: telepathy-glib
Branch: master
Commit: d4a47ca60fb39d2f733eba7326d5bd9faec69a93
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=d4a47ca60fb39d2f733eba7326d5bd9faec69a93

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Apr 25 10:28:24 2012 +0200

_tp_asv_to_vardict: use _tp_boxed_to_variant()

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

---

 telepathy-glib/dbus.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index 8b41484..9115385 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -1961,18 +1961,7 @@ tp_asv_dump (GHashTable *asv)
 GVariant *
 _tp_asv_to_vardict (const GHashTable *asv)
 {
-  GValue v = G_VALUE_INIT;
-  GVariant *ret;
-
-  g_value_init (&v, TP_HASH_TYPE_STRING_VARIANT_MAP);
-  g_value_set_boxed (&v, asv);
-
-  ret = dbus_g_value_build_g_variant (&v);
-  g_assert (!tp_strdiff (g_variant_get_type_string (ret), "a{sv}"));
-
-  g_value_unset (&v);
-
-  return g_variant_ref_sink (ret);
+  return _tp_boxed_to_variant (TP_HASH_TYPE_STRING_VARIANT_MAP, "a{sv}", (gpointer) asv);
 }
 
 GVariant *



More information about the telepathy-commits mailing list