Merge lp:~aacid/qmenumodel/disabledMenus into lp:qmenumodel

[Albert Astals Cid]

Use submenu-enabled for those items that don't have an action (if it exists)

Silo available at https://bileto.ubuntu.com/#/ticket/2548

Goes with:
https://code.launchpad.net/~aacid/unity8/disabledMenus/+merge/319288
https://code.launchpad.net/~aacid/qtubuntu/disabledMenus/+merge/319287

[Lukáš Tinkl (lukas-kde)]

LGTM, looks good and works fine

review: Approve

=== modified file 'libqmenumodel/src/gtk/gtkmenutrackeritem.c'
--- libqmenumodel/src/gtk/gtkmenutrackeritem.c	2015-04-30 14:35:09 +0000
+++ libqmenumodel/src/gtk/gtkmenutrackeritem.c	2017-03-08 09:25:40 +0000
@@ -469,7 +469,17 @@
         g_variant_unref (state);
     }
   else
-    self->sensitive = TRUE;
+    {
+      gboolean submenu_enabled;
+      if (g_menu_item_get_attribute (self->item, "submenu-enabled", "b", &submenu_enabled))
+        {
+          self->sensitive = submenu_enabled;
+        }
+      else
+        {
+          self->sensitive = TRUE;
+        }
+    }
 
   return self;
 }