ayatana-commits team mailing list archive

[Aurélien Gâteau <aurelien.gateau@xxxxxxxxxxxxx>]

Aurélien Gâteau has proposed merging lp:~agateau/appmenu-gtk/fix597550 into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)
Related bugs:
  #597550 (gnome-panel:2430): LIBDBUSMENU-GLIB-CRITICAL **: dbusmenu_server_set_root: assertion `DBUSMENU_IS_MENUITEM(root)' failed
  https://bugs.launchpad.net/bugs/597550


Do not pass an invalid root to dbusmenu_server_set_root()
-- 
https://code.launchpad.net/~agateau/appmenu-gtk/fix597550/+merge/28401
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-06-22 17:12:56 +0000
+++ src/bridge.c	2010-06-24 13:19:25 +0000
@@ -608,9 +608,12 @@
                          (GtkCallback)rebuild_item,
                          &recurse);
 
-  context->root = recurse.stack[0];
+  if (recurse.count > -1)
+    {
+      context->root = recurse.stack[0];
 
-  dbusmenu_server_set_root (context->server, context->root);
+      dbusmenu_server_set_root (context->server, context->root);
+    }
 }