ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/dbusmenu/limited-recursion into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)

For more details, see:
https://code.launchpad.net/~ted/dbusmenu/limited-recursion/+merge/50950

Fixing the recursion so it happens in the right cases.
-- 
https://code.launchpad.net/~ted/dbusmenu/limited-recursion/+merge/50950
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c	2011-02-22 03:41:54 +0000
+++ libdbusmenu-glib/menuitem.c	2011-02-23 16:38:02 +0000
@@ -1433,7 +1433,7 @@
 
 	/* Pillage the children */
 	GList * children = dbusmenu_menuitem_get_children(mi);
-	if (children == NULL && recurse != 0) {
+	if (children == NULL || recurse == 0) {
 		g_variant_builder_add_value(&tupleb, g_variant_new_array(G_VARIANT_TYPE_VARIANT, NULL, 0));
 	} else {
 		GVariantBuilder childrenbuilder;