DBus Menu

Merge lp:~ted/libdbusmenu/about-to-show-tuple into lp:libdbusmenu/0.6

  1. about-to-show-tuple
  2. Merge into trunk.0.6
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 403
Merged at revision: 406
Proposed branch: lp:~ted/libdbusmenu/about-to-show-tuple
Merge into: lp:libdbusmenu/0.6
Diff against target: 28 lines (+5/-3)
1 file modified
libdbusmenu-glib/server.c (+5/-3)
To merge this branch: bzr merge lp:~ted/libdbusmenu/about-to-show-tuple
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+101248@code.launchpad.net

Description of the change

Fixing about-to-show grouping. Not sure why this didn't happen in the unit tests, but for now, focusing on getting the fix out.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Good catch!

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 2012-03-30 21:23:39 +0000
3+++ libdbusmenu-glib/server.c 2012-04-09 15:15:25 +0000
4@@ -1831,12 +1831,13 @@
5 gint32 id;
6 GVariantIter iter;
7 GVariantBuilder builder;
8-
9- g_variant_iter_init(&iter, params);
10+
11+ GVariant * items = g_variant_get_child_value(params, 0);
12+ g_variant_iter_init(&iter, items);
13 g_variant_builder_init(&builder, G_VARIANT_TYPE("ai"));
14 gboolean gotone = FALSE;
15
16- while (g_variant_iter_loop(&iter, "(i)", &id)) {
17+ while (g_variant_iter_loop(&iter, "i", &id)) {
18 DbusmenuMenuitem * mi = lookup_menuitem_by_id(server, id);
19 if (mi != NULL) {
20 g_timeout_add(0, bus_about_to_show_idle, g_object_ref(mi));
21@@ -1872,6 +1873,7 @@
22 }
23
24 g_variant_unref(errors);
25+ g_variant_unref(items);
26
27 return;
28 }

Subscribers

People subscribed via source and target branches

to all changes: