Merge lp:~larsu/libindicator/support-submenu-action into lp:libindicator/14.04

[Lars Karlitski]

indicator-ng: support "submenu-action" on root menu items

indicator-ng: support "submenu-action" on root menu items

Treat "submenu-action" attributes on the root menu item in the same way that gtk+ does. If that attribute exists, it must reference an action with boolean state that is set to 'true' whenever a corresponding indicator menu is open.

We need this for root items because they are not handled by gtk's menu tracker. Nested submenus already get this.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:522
http://jenkins.qa.ubuntu.com/job/libindicator-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/libindicator-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libindicator-ci/50/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Nice work!

review: Approve

=== modified file 'libindicator/indicator-ng.c'
--- libindicator/indicator-ng.c	2013-12-20 11:30:44 +0000
+++ libindicator/indicator-ng.c	2014-01-29 13:30:47 +0000
@@ -35,6 +35,7 @@
   gchar *header_action;
   gchar *scroll_action;
   gchar *secondary_action;
+  gchar *submenu_action;
   gint position;
 
   guint name_watch_id;
@@ -162,6 +163,7 @@
   g_free (self->header_action);
   g_free (self->scroll_action);
   g_free (self->secondary_action);
+  g_free (self->submenu_action);
 
   G_OBJECT_CLASS (indicator_ng_parent_class)->finalize (object);
 }
@@ -214,6 +216,28 @@
 }
 
 static void
+indicator_ng_menu_shown (GtkWidget *widget,
+                         gpointer   user_data)
+{
+  IndicatorNg *self = user_data;
+
+  if (self->submenu_action)
+    g_action_group_change_action_state (self->actions, self->submenu_action,
+                                        g_variant_new_boolean (TRUE));
+}
+
+static void
+indicator_ng_menu_hidden (GtkWidget *widget,
+                          gpointer   user_data)
+{
+  IndicatorNg *self = user_data;
+
+  if (self->submenu_action)
+    g_action_group_change_action_state (self->actions, self->submenu_action,
+                                        g_variant_new_boolean (FALSE));
+}
+
+static void
 indicator_ng_set_accessible_desc (IndicatorNg *self,
                                   const gchar *accessible_desc)
 {
@@ -390,6 +414,13 @@
               g_free (action);
             }
 
+          if (g_menu_model_get_item_attribute (self->menu, 0, "submenu-action", "s", &action))
+            {
+              if (g_str_has_prefix (action, "indicator."))
+                self->submenu_action = g_strdup (action + strlen ("indicator."));
+              g_free (action);
+            }
+
           popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU);
           if (popup)
             {
@@ -657,6 +688,9 @@
 
   self->entry.menu = g_object_ref_sink (gtk_menu_new ());
 
+  g_signal_connect (self->entry.menu, "show", G_CALLBACK (indicator_ng_menu_shown), self);
+  g_signal_connect (self->entry.menu, "hide", G_CALLBACK (indicator_ng_menu_hidden), self);
+
   /* work around IndicatorObject's warning that the accessible
    * description is missing. We never set it on construction, but when
    * the menu model has arrived on the bus.