diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 150b9a8..55bb1f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.98-0ubuntu2~ppa4) UNRELEASED; urgency=low + + * Upstream merge + * Fixing fixed recursion states + + -- Ted Gould <ted@ubuntu.com> Wed, 23 Feb 2011 11:00:35 -0600 + libdbusmenu (0.3.98-0ubuntu2~ppa3) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index e5b7af8..0e9aae4 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -1482,7 +1482,7 @@ dbusmenu_menuitem_build_variant (DbusmenuMenuitem * mi, const gchar ** propertie /* 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; |