DBus Menu

Merge lp:~ted/libdbusmenu/get-children-signatures into lp:libdbusmenu/0.5

  1. get-children-signatures
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 193
Proposed branch: lp:~ted/libdbusmenu/get-children-signatures
Merge into: lp:libdbusmenu/0.5
Diff against target: 32 lines (+9/-2)
1 file modified
libdbusmenu-glib/server.c (+9/-2)
To merge this branch: bzr merge lp:~ted/libdbusmenu/get-children-signatures
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+47560@code.launchpad.net

Description of the change

Fixing the signatures on the variants for GetChildren so it works.

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/server.c'
2--- libdbusmenu-glib/server.c 2011-01-20 14:19:10 +0000
3+++ libdbusmenu-glib/server.c 2011-01-26 17:29:10 +0000
4@@ -975,11 +975,17 @@
5 {
6 DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(data);
7 GVariantBuilder * builder = (GVariantBuilder *)(user_data);
8+ GVariantBuilder tuple;
9+
10+ g_variant_builder_init(&tuple, G_VARIANT_TYPE_TUPLE);
11
12 gint id = dbusmenu_menuitem_get_id(mi);
13+ g_variant_builder_add_value(&tuple, g_variant_new_int32(id));
14+
15 GVariant * props = dbusmenu_menuitem_properties_variant(mi);
16+ g_variant_builder_add_value(&tuple, props);
17
18- g_variant_builder_add(builder, "ia{sv}", id, props);
19+ g_variant_builder_add_value(builder, g_variant_builder_end(&tuple));
20
21 return;
22 }
23@@ -1020,7 +1026,8 @@
24
25 g_list_foreach(children, serialize_menuitem, &builder);
26
27- ret = g_variant_new("(a(ia{svg}))", g_variant_builder_end(&builder));
28+ GVariant * end = g_variant_builder_end(&builder);
29+ ret = g_variant_new_tuple(&end, 1);
30 } else {
31 GError * error = NULL;
32 ret = g_variant_parse(g_variant_type_new("(a(ia{sv}))"), "([(0, {})],)", NULL, NULL, &error);

Subscribers

People subscribed via source and target branches