DBus Menu

Merge lp:~ted/libdbusmenu/limited-recursion into lp:libdbusmenu/0.5

  1. limited-recursion
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Approved by: Kalle Valo
Approved revision: 221
Merged at revision: 222
Proposed branch: lp:~ted/libdbusmenu/limited-recursion
Merge into: lp:libdbusmenu/0.5
Diff against target: 12 lines (+1/-1)
1 file modified
libdbusmenu-glib/menuitem.c (+1/-1)
To merge this branch: bzr merge lp:~ted/libdbusmenu/limited-recursion
Reviewer Review Type Date Requested Status
Kalle Valo (community) Approve
Review via email: mp+50950@code.launchpad.net

Description of the change

Fixing the recursion so it happens in the right cases.

To post a comment you must log in.
Revision history for this message
Kalle Valo (kvalo) wrote :

Makes sense to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/menuitem.c'
2--- libdbusmenu-glib/menuitem.c 2011-02-22 03:41:54 +0000
3+++ libdbusmenu-glib/menuitem.c 2011-02-23 16:39:36 +0000
4@@ -1433,7 +1433,7 @@
5
6 /* Pillage the children */
7 GList * children = dbusmenu_menuitem_get_children(mi);
8- if (children == NULL && recurse != 0) {
9+ if (children == NULL || recurse == 0) {
10 g_variant_builder_add_value(&tupleb, g_variant_new_array(G_VARIANT_TYPE_VARIANT, NULL, 0));
11 } else {
12 GVariantBuilder childrenbuilder;

Subscribers

People subscribed via source and target branches