diff options
author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-09-12 12:55:09 +0200 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-09-15 15:37:26 +0200 |
commit | 51115c42577150c400a9785b77714efd442117a8 (patch) | |
tree | a24764170bfea5e4a3f146ced561aaa9ffd90cb7 /telepathy-glib/dbus.c | |
parent | 2f3d04a0fb793570967d2451c2ed3b6c6c0ea733 (diff) | |
download | telepathy-glib-51115c42577150c400a9785b77714efd442117a8.tar.gz |
Move GVariant utilities to variant-util.ch
Diffstat (limited to 'telepathy-glib/dbus.c')
-rw-r--r-- | telepathy-glib/dbus.c | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c index aaffce260..04ba84bd4 100644 --- a/telepathy-glib/dbus.c +++ b/telepathy-glib/dbus.c @@ -1952,61 +1952,3 @@ tp_asv_dump (GHashTable *asv) g_debug ("}"); } - -/* - * _tp_asv_to_vardict: - * - * Returns: (transfer full): a #GVariant of type %G_VARIANT_TYPE_VARDICT - */ -GVariant * -_tp_asv_to_vardict (const GHashTable *asv) -{ - return _tp_boxed_to_variant (TP_HASH_TYPE_STRING_VARIANT_MAP, "a{sv}", (gpointer) asv); -} - -GVariant * -_tp_boxed_to_variant (GType gtype, - const gchar *variant_type, - gpointer boxed) -{ - GValue v = G_VALUE_INIT; - GVariant *ret; - - g_return_val_if_fail (boxed != NULL, NULL); - - g_value_init (&v, gtype); - g_value_set_boxed (&v, boxed); - - ret = dbus_g_value_build_g_variant (&v); - g_return_val_if_fail (!tp_strdiff (g_variant_get_type_string (ret), variant_type), NULL); - - g_value_unset (&v); - - return g_variant_ref_sink (ret); -} - -/* - * _tp_asv_from_vardict: - * @variant: a #GVariant of type %G_VARIANT_TYPE_VARDICT - * - * Returns: (transfer full): a newly created #GHashTable of - * type #TP_HASH_TYPE_STRING_VARIANT_MAP - */ -GHashTable * -_tp_asv_from_vardict (GVariant *variant) -{ - GValue v = G_VALUE_INIT; - GHashTable *result; - - g_return_val_if_fail (variant != NULL, NULL); - g_return_val_if_fail (g_variant_is_of_type (variant, G_VARIANT_TYPE_VARDICT), - NULL); - - dbus_g_value_parse_g_variant (variant, &v); - g_assert (G_VALUE_HOLDS (&v, TP_HASH_TYPE_STRING_VARIANT_MAP)); - - result = g_value_dup_boxed (&v); - - g_value_unset (&v); - return result; -} |