Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/dbusmenu/limited-recursion/+merge/50950
proposed by: Ted Gould (ted)
review: Approve - Kalle Valo (kvalo)
------------------------------------------------------------
revno: 222 [merge]
committer: Ted Gould <[email protected]>
branch nick: trunk
timestamp: Thu 2011-02-24 08:18:31 -0600
message:
Make sure to not recurse if the value says we shouldn't
modified:
libdbusmenu-glib/menuitem.c
--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c 2011-02-23 19:24:04 +0000
+++ libdbusmenu-glib/menuitem.c 2011-02-24 14:18:31 +0000
@@ -1436,7 +1436,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;
_______________________________________________
Mailing list: https://launchpad.net/~ayatana-commits
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
