← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ted/dbusmenu/lp726678 into lp:dbusmenu

 

Ted Gould has proposed merging lp:~ted/dbusmenu/lp726678 into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)
Related bugs:
  #726678 GTK application menus are not correctly displayed
  https://bugs.launchpad.net/bugs/726678

For more details, see:
https://code.launchpad.net/~ted/dbusmenu/lp726678/+merge/51777

Actually look for the menu item.  Duh.
-- 
https://code.launchpad.net/~ted/dbusmenu/lp726678/+merge/51777
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2011-02-24 19:52:01 +0000
+++ libdbusmenu-glib/server.c	2011-03-01 16:51:50 +0000
@@ -1180,7 +1180,11 @@
 	GVariant * items = NULL;
 
 	if (priv->root != NULL) {
-		items = dbusmenu_menuitem_build_variant(priv->root, props, recurse);
+		DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, parent);
+
+		if (mi != NULL) {
+			items = dbusmenu_menuitem_build_variant(mi, props, recurse);
+		}
 	}
 
 	/* What happens if we don't have anything? */


Follow ups