ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/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

-- 
https://code.launchpad.net/~bratsche/appmenu-gtk/fix597550/+merge/28430
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-06-24 13:13:43 +0000
+++ src/bridge.c	2010-06-24 16:22:24 +0000
@@ -549,6 +549,8 @@
   AppWindowContext *context;
   RecurseContext recurse;
 
+  memset (&recurse, 0, sizeof (RecurseContext));
+
   if (!GTK_IS_WINDOW (toplevel))
     {
       g_signal_connect (G_OBJECT (toplevel),
@@ -608,9 +610,15 @@
                          (GtkCallback)rebuild_item,
                          &recurse);
 
+<<<<<<< TREE
   if (recurse.count > -1)
     {
       context->root = recurse.stack[0];
+=======
+  if (recurse.stack[0] != NULL && DBUSMENU_IS_MENUITEM (recurse.stack[0]))
+    {
+      context->root = recurse.stack[0];
+>>>>>>> MERGE-SOURCE
 
       dbusmenu_server_set_root (context->server, context->root);
     }