ayatana-commits team mailing list archive

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

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

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)


Export menu items in the right order.

This fixes the KDE menubar applet, but will cause the GNOME appmenu indicator to show reverted menus until it is patched as well. I am on it.
-- 
https://code.launchpad.net/~agateau/appmenu-gtk/fix-menu-order/+merge/30535
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-07-20 14:02:07 +0000
+++ src/bridge.c	2010-07-21 13:49:45 +0000
@@ -758,12 +758,8 @@
 
           if (recurse->count > 0)
             {
-              if (recurse->count == 1)
-                dbusmenu_menuitem_child_append (recurse->stack[recurse->count - 1],
-                                                recurse->stack[recurse->count]);
-              else
-                dbusmenu_menuitem_child_prepend (recurse->stack[recurse->count - 1],
-                                                 recurse->stack[recurse->count]);
+              dbusmenu_menuitem_child_append (recurse->stack[recurse->count - 1],
+                                              recurse->stack[recurse->count]);
             }
         }