ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/dbusmenu/separators-sans-submenus-silly into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)


This fixes "The GIMP Crash" which turns out is a submenu being put on a separator.  It can be caused with the proposed mock-json-app utility and the following JSON fragment:

{
  "id": 0,
  "children-display": "submenu",
  "submenu": [
      {
        "id": 234,
        "enabled": true,
        "label": "Layer",
        "children-display": "submenu",
        "visible": true,
        "submenu": [
            {
              "id": 287,
              "type": "separator",
              "children-display": "submenu",
              "submenu": [
                  {
                    "id": 288,
                    "enabled": false,
                    "label": "Empty",
                    "visible": true
                  }
              ]
            },
        ]
      }
  ]
}
-- 
https://code.launchpad.net/~ted/dbusmenu/separators-sans-submenus-silly/+merge/28813
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2010-06-22 21:29:08 +0000
+++ libdbusmenu-gtk/client.c	2010-06-30 00:15:38 +0000
@@ -503,6 +503,7 @@
 	#endif
 
 	if (dbusmenu_menuitem_get_root(mi)) { return; }
+	if (g_strcmp0(dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE), DBUSMENU_CLIENT_TYPES_SEPARATOR) == 0) { return; }
 
 	gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu);
 	GtkMenu * menu = GTK_MENU(ann_menu);