diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-14 23:11:28 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-14 23:11:28 -0600 |
| commit | b0c5bfe2e4d50d12dc4b8ab9828b67b47abbd5a3 (patch) | |
| tree | 23d5c84123a3a26a2ea95de5fc2e8ab1f898dbfb | |
| parent | 331a9b26f51f79a1c06dde2ca5c1364431e471be (diff) | |
| download | libdbusmenu-b0c5bfe2e4d50d12dc4b8ab9828b67b47abbd5a3.tar.gz libdbusmenu-b0c5bfe2e4d50d12dc4b8ab9828b67b47abbd5a3.tar.bz2 libdbusmenu-b0c5bfe2e4d50d12dc4b8ab9828b67b47abbd5a3.zip | |
Splitting a few of these out so they're easier to follow
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 6 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 7ea54e2..044138e 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -1250,7 +1250,9 @@ dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi) static void variant_helper (gpointer in_key, gpointer in_value, gpointer user_data) { - g_variant_builder_add((GVariantBuilder *)user_data, "{sv}", in_key, in_value); + GVariant * value = g_variant_new_dict_entry(g_variant_new_string((gchar *)in_key), + g_variant_new_variant((GVariant *)in_value)); + g_variant_builder_add_value((GVariantBuilder *)user_data, value); return; } @@ -1274,7 +1276,7 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi, const gchar ** prop if (g_hash_table_size(priv->properties) > 0) { GVariantBuilder builder; - g_variant_builder_init(&builder, g_variant_type_new("a{sv}")); + g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY); g_hash_table_foreach(priv->properties, variant_helper, &builder); diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index ed23d16..2852b7b 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -1058,8 +1058,10 @@ bus_get_layout (DbusmenuServer * server, GVariant * params, GDBusMethodInvocatio g_variant_builder_add_value(&tuplebuilder, g_variant_new_uint32(revision)); g_variant_builder_add_value(&tuplebuilder, items); + GVariant * retval = g_variant_builder_end(&tuplebuilder); + // g_debug("Sending layout type: %s", g_variant_get_type_string(retval)); g_dbus_method_invocation_return_value(invocation, - g_variant_builder_end(&tuplebuilder)); + retval); return; } |