diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-01-27 16:40:56 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-01-27 16:40:56 -0500 |
| commit | e08b0e33060a39b3c95e43531825a95f5d415af8 (patch) | |
| tree | cb3deecc01d16e57265afe76ce1074df10a79baa /libdbusmenu-glib/server.c | |
| parent | 4ef0a2886c4d4865a453ee32656937eb37669421 (diff) | |
| parent | ea3e23cd918f2b8c7b6f9a94b3d80499bc0ce550 (diff) | |
| download | libdbusmenu-e08b0e33060a39b3c95e43531825a95f5d415af8.tar.gz libdbusmenu-e08b0e33060a39b3c95e43531825a95f5d415af8.tar.bz2 libdbusmenu-e08b0e33060a39b3c95e43531825a95f5d415af8.zip | |
releasing version 0.3.94-0ubuntu1
Diffstat (limited to 'libdbusmenu-glib/server.c')
| -rw-r--r-- | libdbusmenu-glib/server.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 095f333..adb9f91 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -975,11 +975,17 @@ serialize_menuitem(gpointer data, gpointer user_data) { DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(data); GVariantBuilder * builder = (GVariantBuilder *)(user_data); + GVariantBuilder tuple; + + g_variant_builder_init(&tuple, G_VARIANT_TYPE_TUPLE); gint id = dbusmenu_menuitem_get_id(mi); + g_variant_builder_add_value(&tuple, g_variant_new_int32(id)); + GVariant * props = dbusmenu_menuitem_properties_variant(mi); + g_variant_builder_add_value(&tuple, props); - g_variant_builder_add(builder, "ia{sv}", id, props); + g_variant_builder_add_value(builder, g_variant_builder_end(&tuple)); return; } @@ -1020,7 +1026,8 @@ bus_get_children (DbusmenuServer * server, GVariant * params, GDBusMethodInvocat g_list_foreach(children, serialize_menuitem, &builder); - ret = g_variant_new("(a(ia{svg}))", g_variant_builder_end(&builder)); + GVariant * end = g_variant_builder_end(&builder); + ret = g_variant_new_tuple(&end, 1); } else { GError * error = NULL; ret = g_variant_parse(g_variant_type_new("(a(ia{sv}))"), "([(0, {})],)", NULL, NULL, &error); |