Merge lp:~attente/unity-gtk-module/1208019-2 into lp:unity-gtk-module/14.04

[William Hua]

Forward show and hide signals to GTK+ menus.

Forward show and hide signals to GTK+ menus.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-gtk-module-ci/45/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-gtk-module/1208019-2]

328. By William Hua on 2014-04-24

Explain what we're doing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/32/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-gtk-module-ci/46/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

I thought we got a signal when menus opened if we defined an action to receive it. Can we use that?

review: Needs Information

[William Hua (attente)]

The module already exports an action for every menu item (except separators), but it doesn't seem like we get a signal for menu items with a submenu.

[William Hua (attente)]

I didn't try it in code, this was only by looking through the dbus-monitor logs though.

[lp:~attente/unity-gtk-module/1208019-2]

329. By William Hua on 2014-05-07

Add submenu actions.

330. By William Hua on 2014-05-07

Don't eagerly show.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-gtk-module-ci/47/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-gtk-module-ci/48/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-gtk-module/1208019-2]

331. By William Hua on 2014-05-08

Remove debugging output.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-gtk-module-ci/49/rebuild

review: Approve (continuous-integration)

[William Hua (attente)]

We need to backport the GTK+ patch on this bug report for this branch to work properly:

https://bugzilla.gnome.org/show_bug.cgi?id=729820

[lp:~attente/unity-gtk-module/1208019-2]

332. By William Hua on 2014-05-14

Dispatch hide in idle.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/4/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~attente/unity-gtk-module/1208019-2]

333. By William Hua on 2014-05-19

Fix accelerators.

334. By William Hua on 2014-05-19

Rename label to label_label.

335. By William Hua on 2014-05-19

Watch contents of menu items.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:335
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-gtk-module-ci/51/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Don't see anything. Feel like I should complain more. Thanks for adjusting this to use the submenu actions, a lot more code, but I think a cleaner solution!

review: Approve

=== modified file 'lib/unity-gtk-action-group.c'
--- lib/unity-gtk-action-group.c	2014-03-25 21:48:16 +0000
+++ lib/unity-gtk-action-group.c	2014-05-19 16:34:24 +0000
@@ -42,6 +42,14 @@
 
 static gboolean unity_gtk_action_group_debug;
 
+static gboolean
+g_signal_emit_hide (gpointer user_data)
+{
+  g_signal_emit_by_name (user_data, "hide");
+
+  return G_SOURCE_REMOVE;
+}
+
 static void
 unity_gtk_action_group_handle_group_action_added (GActionGroup *action_group,
                                                   gchar        *action_name,
@@ -272,54 +280,79 @@
 
       if (action != NULL)
         {
-          if (action->items_by_name != NULL)
+          if (g_strcmp0 (name, action->name) == 0)
             {
-              if (value != NULL)
-                {
-                  const gchar *name;
-                  UnityGtkMenuItem *item;
-
-                  g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING));
-
-                  name = g_variant_get_string (value, NULL);
-                  item = g_hash_table_lookup (action->items_by_name, name);
-
-                  if (item == NULL || !unity_gtk_menu_item_is_check (item))
-                    {
-                      g_warn_if_reached ();
-
-                      value = NULL;
-                    }
-                  else
-                    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item->menu_item), TRUE);
-                }
-
-              if (value == NULL)
-                {
-                  GHashTableIter iter;
-                  gpointer value;
-
-                  g_hash_table_iter_init (&iter, action->items_by_name);
-                  while (g_hash_table_iter_next (&iter, NULL, &value))
-                    {
-                      UnityGtkMenuItem *item = value;
-
-                      if (unity_gtk_menu_item_is_check (item))
-                        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item->menu_item), FALSE);
-                    }
-                }
+              if (action->items_by_name != NULL)
+                {
+                  if (value != NULL)
+                    {
+                      const gchar *name;
+                      UnityGtkMenuItem *item;
+
+                      g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING));
+
+                      name = g_variant_get_string (value, NULL);
+                      item = g_hash_table_lookup (action->items_by_name, name);
+
+                      if (item == NULL || !unity_gtk_menu_item_is_check (item))
+                        {
+                          g_warn_if_reached ();
+
+                          value = NULL;
+                        }
+                      else
+                        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item->menu_item), TRUE);
+                    }
+
+                  if (value == NULL)
+                    {
+                      GHashTableIter iter;
+                      gpointer value;
+
+                      g_hash_table_iter_init (&iter, action->items_by_name);
+                      while (g_hash_table_iter_next (&iter, NULL, &value))
+                        {
+                          UnityGtkMenuItem *item = value;
+
+                          if (unity_gtk_menu_item_is_check (item))
+                            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item->menu_item), FALSE);
+                        }
+                    }
+                }
+              else if (action->item != NULL && unity_gtk_menu_item_is_check (action->item))
+                {
+                  g_return_if_fail (value != NULL && g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN));
+
+                  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (action->item->menu_item), g_variant_get_boolean (value));
+                }
+              else
+                g_warn_if_fail (value == NULL);
+
+              return;
             }
-          else if (action->item != NULL && unity_gtk_menu_item_is_check (action->item))
+          else if (g_strcmp0 (name, action->subname) == 0)
             {
+              GtkWidget *submenu;
+
               g_return_if_fail (value != NULL && g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN));
-
-              gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (action->item->menu_item), g_variant_get_boolean (value));
+              g_return_if_fail (action->item != NULL && action->item->menu_item != NULL);
+
+              submenu = gtk_menu_item_get_submenu (action->item->menu_item);
+
+              g_return_if_fail (submenu != NULL);
+
+              if (g_variant_get_boolean (value))
+                g_signal_emit_by_name (submenu, "show");
+              else
+                g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, g_signal_emit_hide, g_object_ref (submenu), g_object_unref);
+
+              return;
             }
           else
-            g_warn_if_fail (value == NULL);
-
-          return;
+            g_warn_if_reached ();
         }
+      else
+        g_warn_if_reached ();
     }
   else
     g_warn_if_reached ();
@@ -359,33 +392,40 @@
 
       if (action != NULL)
         {
-          if (action->items_by_name != NULL)
-            {
-              const gchar *name;
-              UnityGtkMenuItem *item;
-
-              g_return_if_fail (parameter != NULL && g_variant_is_of_type (parameter, G_VARIANT_TYPE_STRING));
-
-              name = g_variant_get_string (parameter, NULL);
-              item = g_hash_table_lookup (action->items_by_name, name);
-
-              if (item != NULL)
-                unity_gtk_menu_item_activate (item);
-
-              g_action_group_action_state_changed (G_ACTION_GROUP (group), action->name, parameter);
-            }
-          else if (action->item != NULL)
-            {
-              if (unity_gtk_menu_item_get_draw_as_radio (action->item))
-                g_warn_if_fail (g_variant_is_of_type (parameter, G_VARIANT_TYPE_STRING));
-              else
-                g_warn_if_fail (parameter == NULL);
-
-              unity_gtk_menu_item_activate (action->item);
-            }
-
-          return;
+          if (g_strcmp0 (name, action->name) == 0)
+            {
+              if (action->items_by_name != NULL)
+                {
+                  const gchar *name;
+                  UnityGtkMenuItem *item;
+
+                  g_return_if_fail (parameter != NULL && g_variant_is_of_type (parameter, G_VARIANT_TYPE_STRING));
+
+                  name = g_variant_get_string (parameter, NULL);
+                  item = g_hash_table_lookup (action->items_by_name, name);
+
+                  if (item != NULL)
+                    unity_gtk_menu_item_activate (item);
+
+                  g_action_group_action_state_changed (G_ACTION_GROUP (group), action->name, parameter);
+                }
+              else if (action->item != NULL)
+                {
+                  if (unity_gtk_menu_item_get_draw_as_radio (action->item))
+                    g_warn_if_fail (g_variant_is_of_type (parameter, G_VARIANT_TYPE_STRING));
+                  else
+                    g_warn_if_fail (parameter == NULL);
+
+                  unity_gtk_menu_item_activate (action->item);
+                }
+
+              return;
+            }
+          else
+            g_warn_if_reached ();
         }
+      else
+        g_warn_if_reached ();
     }
   else
     g_warn_if_reached ();
@@ -419,111 +459,142 @@
 
       if (action != NULL)
         {
-          if (enabled != NULL)
+          if (g_strcmp0 (name, action->name) == 0)
             {
-              if (action->items_by_name != NULL)
-                {
-                  GHashTableIter iter;
-                  gpointer value;
-
-                  *enabled = FALSE;
-
-                  g_hash_table_iter_init (&iter, action->items_by_name);
-                  while (!*enabled && g_hash_table_iter_next (&iter, NULL, &value))
-                    *enabled = unity_gtk_menu_item_is_sensitive (value);
-                }
-              else
-                *enabled = action->item != NULL && unity_gtk_menu_item_is_sensitive (action->item);
+              if (enabled != NULL)
+                {
+                  if (action->items_by_name != NULL)
+                    {
+                      GHashTableIter iter;
+                      gpointer value;
+
+                      *enabled = FALSE;
+
+                      g_hash_table_iter_init (&iter, action->items_by_name);
+                      while (!*enabled && g_hash_table_iter_next (&iter, NULL, &value))
+                        *enabled = unity_gtk_menu_item_is_sensitive (value);
+                    }
+                  else
+                    *enabled = action->item != NULL && unity_gtk_menu_item_is_sensitive (action->item);
+                }
+
+              if (parameter_type != NULL)
+                {
+                  if (action->items_by_name != NULL || (action->item != NULL && unity_gtk_menu_item_get_draw_as_radio (action->item)))
+                    *parameter_type = G_VARIANT_TYPE_STRING;
+                  else
+                    *parameter_type = NULL;
+                }
+
+              if (state_type != NULL)
+                {
+                  if (action->items_by_name != NULL || (action->item != NULL && unity_gtk_menu_item_get_draw_as_radio (action->item)))
+                    *state_type = G_VARIANT_TYPE_STRING;
+                  else if (action->item != NULL && unity_gtk_menu_item_is_check (action->item))
+                    *state_type = G_VARIANT_TYPE_BOOLEAN;
+                  else
+                    *state_type = NULL;
+                }
+
+              if (state_hint != NULL)
+                {
+                  if (action->items_by_name != NULL)
+                    {
+                      GVariantBuilder builder;
+                      GHashTableIter iter;
+                      gpointer key;
+
+                      g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
+
+                      g_hash_table_iter_init (&iter, action->items_by_name);
+                      while (g_hash_table_iter_next (&iter, &key, NULL))
+                        g_variant_builder_add (&builder, "s", key);
+
+                      *state_hint = g_variant_ref_sink (g_variant_builder_end (&builder));
+                    }
+                  else if (action->item != NULL && unity_gtk_menu_item_is_check (action->item))
+                    {
+                      GVariantBuilder builder;
+
+                      if (unity_gtk_menu_item_get_draw_as_radio (action->item))
+                        {
+                          g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
+                          g_variant_builder_add (&builder, "s", action->name);
+                          *state_hint = g_variant_ref_sink (g_variant_builder_end (&builder));
+                        }
+                      else
+                        {
+                          g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
+                          g_variant_builder_add (&builder, "b", FALSE);
+                          g_variant_builder_add (&builder, "b", TRUE);
+                          *state_hint = g_variant_ref_sink (g_variant_builder_end (&builder));
+                        }
+                    }
+                  else
+                    *state_hint = NULL;
+                }
+
+              if (state != NULL)
+                {
+                  if (action->items_by_name != NULL)
+                    {
+                      GHashTableIter iter;
+                      gpointer key;
+                      gpointer value;
+
+                      *state = NULL;
+
+                      g_hash_table_iter_init (&iter, action->items_by_name);
+                      while (*state == NULL && g_hash_table_iter_next (&iter, &key, &value))
+                        if (unity_gtk_menu_item_is_active (value))
+                          *state = g_variant_ref_sink (g_variant_new_string (key));
+                    }
+                  else if (action->item != NULL && unity_gtk_menu_item_is_check (action->item))
+                    {
+                      if (unity_gtk_menu_item_get_draw_as_radio (action->item))
+                        {
+                          if (unity_gtk_menu_item_is_active (action->item))
+                            *state = g_variant_ref_sink (g_variant_new_string (action->name));
+                          else
+                            *state = g_variant_ref_sink (g_variant_new_string (""));
+                        }
+                      else
+                        *state = g_variant_ref_sink (g_variant_new_boolean (unity_gtk_menu_item_is_active (action->item)));
+                    }
+                  else
+                    *state = NULL;
+                }
+
+              return TRUE;
             }
+          else if (g_strcmp0 (name, action->subname) == 0)
+            {
+              if (enabled != NULL)
+                *enabled = TRUE;
 
-          if (parameter_type != NULL)
-            {
-              if (action->items_by_name != NULL || (action->item != NULL && unity_gtk_menu_item_get_draw_as_radio (action->item)))
-                *parameter_type = G_VARIANT_TYPE_STRING;
-              else
+              if (parameter_type != NULL)
                 *parameter_type = NULL;
-            }
 
-          if (state_type != NULL)
-            {
-              if (action->items_by_name != NULL || (action->item != NULL && unity_gtk_menu_item_get_draw_as_radio (action->item)))
-                *state_type = G_VARIANT_TYPE_STRING;
-              else if (action->item != NULL && unity_gtk_menu_item_is_check (action->item))
+              if (state_type != NULL)
                 *state_type = G_VARIANT_TYPE_BOOLEAN;
-              else
-                *state_type = NULL;
-            }
 
-          if (state_hint != NULL)
-            {
-              if (action->items_by_name != NULL)
+              if (state_hint != NULL)
                 {
                   GVariantBuilder builder;
-                  GHashTableIter iter;
-                  gpointer key;
-
-                  g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
-
-                  g_hash_table_iter_init (&iter, action->items_by_name);
-                  while (g_hash_table_iter_next (&iter, &key, NULL))
-                    g_variant_builder_add (&builder, "s", key);
-
+
+                  g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
+                  g_variant_builder_add (&builder, "b", FALSE);
+                  g_variant_builder_add (&builder, "b", TRUE);
                   *state_hint = g_variant_ref_sink (g_variant_builder_end (&builder));
                 }
-              else if (action->item != NULL && unity_gtk_menu_item_is_check (action->item))
-                {
-                  GVariantBuilder builder;
-
-                  if (unity_gtk_menu_item_get_draw_as_radio (action->item))
-                    {
-                      g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
-                      g_variant_builder_add (&builder, "s", action->name);
-                      *state_hint = g_variant_ref_sink (g_variant_builder_end (&builder));
-                    }
-                  else
-                    {
-                      g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
-                      g_variant_builder_add (&builder, "b", FALSE);
-                      g_variant_builder_add (&builder, "b", TRUE);
-                      *state_hint = g_variant_ref_sink (g_variant_builder_end (&builder));
-                    }
-                }
-              else
-                *state_hint = NULL;
-            }
-
-          if (state != NULL)
-            {
-              if (action->items_by_name != NULL)
-                {
-                  GHashTableIter iter;
-                  gpointer key;
-                  gpointer value;
-
-                  *state = NULL;
-
-                  g_hash_table_iter_init (&iter, action->items_by_name);
-                  while (*state == NULL && g_hash_table_iter_next (&iter, &key, &value))
-                    if (unity_gtk_menu_item_is_active (value))
-                      *state = g_variant_ref_sink (g_variant_new_string (key));
-                }
-              else if (action->item != NULL && unity_gtk_menu_item_is_check (action->item))
-                {
-                  if (unity_gtk_menu_item_get_draw_as_radio (action->item))
-                    {
-                      if (unity_gtk_menu_item_is_active (action->item))
-                        *state = g_variant_ref_sink (g_variant_new_string (action->name));
-                      else
-                        *state = g_variant_ref_sink (g_variant_new_string (""));
-                    }
-                  else
-                    *state = g_variant_ref_sink (g_variant_new_boolean (unity_gtk_menu_item_is_active (action->item)));
-                }
-              else
-                *state = NULL;
-            }
-
-          return TRUE;
+
+              if (state != NULL)
+                *state = g_variant_ref_sink (g_variant_new_boolean (TRUE));
+
+              return TRUE;
+            }
+          else
+            g_warn_if_reached ();
         }
     }
   else
@@ -865,6 +936,21 @@
             g_warn_if_reached ();
 
           g_action_group_action_added (G_ACTION_GROUP (group), new_action->name);
+
+          /* Add a new submenu action so we can detect opening and closing. */
+          if (item->menu_item != NULL && gtk_menu_item_get_submenu (item->menu_item) != NULL)
+            {
+              gchar *subname = unity_gtk_action_group_get_action_name (group, item);
+              unity_gtk_action_set_subname (new_action, subname);
+              g_free (subname);
+
+              if (group->actions_by_name != NULL)
+                g_hash_table_insert (group->actions_by_name, new_action->subname, g_object_ref (new_action));
+              else
+                g_warn_if_reached ();
+
+              g_action_group_action_added (G_ACTION_GROUP (group), new_action->subname);
+            }
         }
     }
 }
@@ -908,6 +994,17 @@
 
                   if (g_hash_table_size (action->items_by_name) == 0)
                     {
+                      /* Remove the submenu action used to detect opening and closing. */
+                      if (action->subname != NULL)
+                        {
+                          if (group->actions_by_name != NULL)
+                            g_hash_table_remove (group->actions_by_name, action->subname);
+                          else
+                            g_warn_if_reached ();
+
+                          g_action_group_action_removed (G_ACTION_GROUP (group), action->subname);
+                        }
+
                       if (group->actions_by_name != NULL)
                         g_hash_table_remove (group->actions_by_name, action->name);
                       else
@@ -924,6 +1021,17 @@
         }
       else
         {
+          /* Remove the submenu action used to detect opening and closing. */
+          if (action->subname != NULL)
+            {
+              if (group->actions_by_name != NULL)
+                g_hash_table_remove (group->actions_by_name, action->subname);
+              else
+                g_warn_if_reached ();
+
+              g_action_group_action_removed (G_ACTION_GROUP (group), action->subname);
+            }
+
           if (group->actions_by_name != NULL)
             g_hash_table_remove (group->actions_by_name, action->name);
           else

=== modified file 'lib/unity-gtk-action-private.h'
--- lib/unity-gtk-action-private.h	2013-02-19 11:55:57 +0000
+++ lib/unity-gtk-action-private.h	2014-05-19 16:34:24 +0000
@@ -46,25 +46,29 @@
 
   /*< private >*/
   gchar            *name;
+  gchar            *subname;
   UnityGtkMenuItem *item;
   GHashTable       *items_by_name;
 };
 
-GType            unity_gtk_action_get_type  (void)                     G_GNUC_INTERNAL;
-
-UnityGtkAction * unity_gtk_action_new       (const gchar      *name,
-                                             UnityGtkMenuItem *item)   G_GNUC_INTERNAL;
-
-UnityGtkAction * unity_gtk_action_new_radio (const gchar      *name)   G_GNUC_INTERNAL;
-
-void             unity_gtk_action_set_name  (UnityGtkAction   *action,
-                                             const gchar      *name)   G_GNUC_INTERNAL;
-
-void             unity_gtk_action_set_item  (UnityGtkAction   *action,
-                                             UnityGtkMenuItem *item)   G_GNUC_INTERNAL;
-
-void             unity_gtk_action_print     (UnityGtkAction   *action,
-                                             guint             indent) G_GNUC_INTERNAL;
+GType            unity_gtk_action_get_type    (void)                      G_GNUC_INTERNAL;
+
+UnityGtkAction * unity_gtk_action_new         (const gchar      *name,
+                                               UnityGtkMenuItem *item)    G_GNUC_INTERNAL;
+
+UnityGtkAction * unity_gtk_action_new_radio   (const gchar      *name)    G_GNUC_INTERNAL;
+
+void             unity_gtk_action_set_name    (UnityGtkAction   *action,
+                                               const gchar      *name)    G_GNUC_INTERNAL;
+
+void             unity_gtk_action_set_subname (UnityGtkAction   *action,
+                                               const gchar      *subname) G_GNUC_INTERNAL;
+
+void             unity_gtk_action_set_item    (UnityGtkAction   *action,
+                                               UnityGtkMenuItem *item)    G_GNUC_INTERNAL;
+
+void             unity_gtk_action_print       (UnityGtkAction   *action,
+                                               guint             indent)  G_GNUC_INTERNAL;
 
 G_END_DECLS
 

=== modified file 'lib/unity-gtk-action.c'
--- lib/unity-gtk-action.c	2013-02-19 11:55:57 +0000
+++ lib/unity-gtk-action.c	2014-05-19 16:34:24 +0000
@@ -41,6 +41,7 @@
     }
 
   unity_gtk_action_set_item (action, NULL);
+  unity_gtk_action_set_subname (action, NULL);
   unity_gtk_action_set_name (action, NULL);
 
   G_OBJECT_CLASS (unity_gtk_action_parent_class)->dispose (object);
@@ -93,6 +94,16 @@
 }
 
 void
+unity_gtk_action_set_subname (UnityGtkAction *action,
+                              const gchar    *subname)
+{
+  g_return_if_fail (UNITY_GTK_IS_ACTION (action));
+
+  g_free (action->subname);
+  action->subname = g_strdup (subname);
+}
+
+void
 unity_gtk_action_set_item (UnityGtkAction   *action,
                            UnityGtkMenuItem *item)
 {
@@ -132,6 +143,9 @@
       if (action->name != NULL)
         g_print ("%s  \"%s\"\n", space, action->name);
 
+      if (action->subname != NULL)
+        g_print ("%s  \"%s\"\n", space, action->subname);
+
       if (action->item != NULL)
         g_print ("%s  (%s *) %p\n", space, G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (action->item)), action->item);
 

=== modified file 'lib/unity-gtk-menu-item-private.h'
--- lib/unity-gtk-menu-item-private.h	2014-03-31 00:40:48 +0000
+++ lib/unity-gtk-menu-item-private.h	2014-05-19 16:34:24 +0000
@@ -52,7 +52,9 @@
   guchar             child_shell_valid : 1;
   guint              item_index;
   UnityGtkAction    *action;
-  gchar             *label;
+  GtkLabel          *first_label;
+  GtkLabel          *second_label;
+  gchar             *label_label;
 };
 
 GType               unity_gtk_menu_item_get_type          (void)                            G_GNUC_INTERNAL;

=== modified file 'lib/unity-gtk-menu-item.c'
--- lib/unity-gtk-menu-item.c	2014-03-31 00:40:48 +0000
+++ lib/unity-gtk-menu-item.c	2014-05-19 16:34:24 +0000
@@ -368,6 +368,75 @@
 }
 
 static void
+unity_gtk_menu_item_disconnect_labels (UnityGtkMenuItem *item)
+{
+  g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (item));
+
+  if (item->second_label != NULL)
+    {
+      g_signal_handlers_disconnect_by_data (item->second_label, item);
+      item->second_label = NULL;
+    }
+
+  if (item->first_label != NULL)
+    {
+      g_signal_handlers_disconnect_by_data (item->first_label, item);
+      item->first_label = NULL;
+    }
+}
+
+static gboolean
+unity_gtk_menu_item_connect_labels (UnityGtkMenuItem *item)
+{
+  GtkLabel *first_label = NULL;
+  GtkLabel *second_label = NULL;
+
+  g_return_val_if_fail (UNITY_GTK_IS_MENU_ITEM (item), FALSE);
+
+  if (item->menu_item != NULL)
+    {
+      /* ensure label is available */
+      gtk_menu_item_get_label (item->menu_item);
+
+      first_label = gtk_menu_item_get_nth_label (item->menu_item, 0);
+      second_label = gtk_menu_item_get_nth_label (item->menu_item, 1);
+    }
+
+  if (first_label != item->first_label || second_label != item->second_label)
+    {
+      unity_gtk_menu_item_disconnect_labels (item);
+
+      item->first_label = first_label;
+      item->second_label = second_label;
+
+      if (item->first_label != NULL)
+        g_signal_connect (item->first_label, "notify", G_CALLBACK (unity_gtk_menu_item_handle_label_notify), item);
+      if (item->second_label != NULL)
+        g_signal_connect (item->second_label, "notify", G_CALLBACK (unity_gtk_menu_item_handle_label_notify), item);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+unity_gtk_menu_item_handle_add_or_remove (GtkContainer *container,
+                                          GtkWidget    *widget,
+                                          gpointer      user_data)
+{
+  UnityGtkMenuItem *item;
+
+  g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (user_data));
+
+  item = UNITY_GTK_MENU_ITEM (user_data);
+
+  /* just ignore the case when parent_shell is NULL */
+  if (item->parent_shell != NULL && unity_gtk_menu_item_connect_labels (item))
+    unity_gtk_menu_shell_handle_item_notify (item->parent_shell, item, "label");
+}
+
+static void
 unity_gtk_menu_item_handle_accel_closures_changed (GtkWidget *widget,
                                                    gpointer   user_data)
 {
@@ -388,23 +457,16 @@
 unity_gtk_menu_item_set_menu_item (UnityGtkMenuItem *item,
                                    GtkMenuItem      *menu_item)
 {
-  GtkLabel *label;
-
   g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (item));
 
   if (menu_item != item->menu_item)
     {
       UnityGtkMenuShell *child_shell = item->child_shell;
 
+      unity_gtk_menu_item_disconnect_labels (item);
+
       if (item->menu_item != NULL)
-        {
-          label = gtk_menu_item_get_nth_label (item->menu_item, 0);
-
-          if (label != NULL)
-            g_signal_handlers_disconnect_by_data (label, item);
-
-          g_signal_handlers_disconnect_by_data (item->menu_item, item);
-        }
+        g_signal_handlers_disconnect_by_data (item->menu_item, item);
 
       if (child_shell != NULL)
         {
@@ -419,20 +481,20 @@
       if (menu_item != NULL)
         {
           g_signal_connect (menu_item, "notify", G_CALLBACK (unity_gtk_menu_item_handle_item_notify), item);
-
-          /* ensure label is available */
-          gtk_menu_item_get_label (menu_item);
-          label = gtk_menu_item_get_nth_label (menu_item, 0);
-
-          if (label != NULL)
-            g_signal_connect (label, "notify", G_CALLBACK (unity_gtk_menu_item_handle_label_notify), item);
-
+          g_signal_connect (menu_item, "add", G_CALLBACK (unity_gtk_menu_item_handle_add_or_remove), item);
+          g_signal_connect (menu_item, "remove", G_CALLBACK (unity_gtk_menu_item_handle_add_or_remove), item);
           g_signal_connect (menu_item, "accel-closures-changed", G_CALLBACK (unity_gtk_menu_item_handle_accel_closures_changed), item);
 
-          /* LP: #1208019 */
+          /*
+           * LP: #1208019: We do this because Eclipse sets menu item
+           * accelerators using private API, and there's no way for us to
+           * detect when they change.
+           */
           if (gtk_menu_item_get_submenu (menu_item) != NULL)
             g_signal_emit_by_name (gtk_menu_item_get_submenu (menu_item), "show");
         }
+
+      unity_gtk_menu_item_connect_labels (item);
     }
 }
 
@@ -470,8 +532,8 @@
 
   item = UNITY_GTK_MENU_ITEM (object);
 
-  g_free (item->label);
-  item->label = NULL;
+  g_free (item->label_label);
+  item->label_label = NULL;
 
   G_OBJECT_CLASS (unity_gtk_menu_item_parent_class)->finalize (object);
 }
@@ -661,7 +723,7 @@
   g_return_val_if_fail (UNITY_GTK_IS_MENU_ITEM (item), NULL);
   g_return_val_if_fail (item->menu_item != NULL, NULL);
 
-  if (item->label == NULL)
+  if (item->label_label == NULL)
     {
       const gchar *label_label = gtk_menu_item_get_label (item->menu_item);
 
@@ -691,16 +753,16 @@
           if (gtk_label_get_use_underline (label))
             {
               if (item->parent_shell == NULL || item->parent_shell->has_mnemonics)
-                item->label = g_strdup (label_label);
+                item->label_label = g_strdup (label_label);
               else
-                item->label = g_strdup_no_mnemonics (label_label);
+                item->label_label = g_strdup_no_mnemonics (label_label);
             }
           else
-            item->label = g_strdup_escape_underscores (label_label);
+            item->label_label = g_strdup_escape_underscores (label_label);
         }
     }
 
-  return item->label;
+  return item->label_label;
 }
 
 GIcon *

=== modified file 'lib/unity-gtk-menu-section.c'
--- lib/unity-gtk-menu-section.c	2014-03-31 00:40:48 +0000
+++ lib/unity-gtk-menu-section.c	2014-05-19 16:34:24 +0000
@@ -27,6 +27,10 @@
 #define G_MENU_ATTRIBUTE_ACCEL_TEXT "x-canonical-accel"
 #endif
 
+#ifndef G_MENU_ATTRIBUTE_SUBMENU_ACTION
+#define G_MENU_ATTRIBUTE_SUBMENU_ACTION "submenu-action"
+#endif
+
 G_DEFINE_TYPE (UnityGtkMenuSection,
                unity_gtk_menu_section,
                G_TYPE_MENU_MODEL);
@@ -136,32 +140,43 @@
       g_object_unref (icon);
     }
 
-  if (action != NULL && action->name != NULL)
+  if (action != NULL)
     {
-      gchar *name = g_strdup_printf ("unity.%s", action->name);
-      GVariant *variant = g_variant_ref_sink (g_variant_new_string (name));
-
-      g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_ACTION, variant);
-
-      if (action->items_by_name != NULL)
-        {
-          GHashTableIter iter;
-          gpointer key;
-          gpointer value;
-          const gchar *target = NULL;
-
-          g_hash_table_iter_init (&iter, action->items_by_name);
-          while (target == NULL && g_hash_table_iter_next (&iter, &key, &value))
-            if (value == item)
-              target = key;
-
-          if (target != NULL)
-            g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_TARGET, g_variant_ref_sink (g_variant_new_string (target)));
-        }
-      else if (unity_gtk_menu_item_get_draw_as_radio (item))
-        g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_TARGET, g_variant_ref_sink (g_variant_new_string (action->name)));
-
-      g_free (name);
+      if (action->name != NULL)
+        {
+          gchar *name = g_strdup_printf ("unity.%s", action->name);
+          GVariant *variant = g_variant_ref_sink (g_variant_new_string (name));
+
+          g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_ACTION, variant);
+
+          if (action->items_by_name != NULL)
+            {
+              GHashTableIter iter;
+              gpointer key;
+              gpointer value;
+              const gchar *target = NULL;
+
+              g_hash_table_iter_init (&iter, action->items_by_name);
+              while (target == NULL && g_hash_table_iter_next (&iter, &key, &value))
+                if (value == item)
+                  target = key;
+
+              if (target != NULL)
+                g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_TARGET, g_variant_ref_sink (g_variant_new_string (target)));
+            }
+          else if (unity_gtk_menu_item_get_draw_as_radio (item))
+            g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_TARGET, g_variant_ref_sink (g_variant_new_string (action->name)));
+
+          g_free (name);
+        }
+
+      if (action->subname != NULL)
+        {
+          gchar *subname = g_strdup_printf ("unity.%s", action->subname);
+          GVariant *variant = g_variant_ref_sink (g_variant_new_string (subname));
+          g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_SUBMENU_ACTION, variant);
+          g_free (subname);
+        }
     }
 
   if (item->menu_item != NULL)

=== modified file 'lib/unity-gtk-menu-shell.c'
--- lib/unity-gtk-menu-shell.c	2014-03-27 19:52:20 +0000
+++ lib/unity-gtk-menu-shell.c	2014-05-19 16:34:24 +0000
@@ -449,8 +449,8 @@
   g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (item));
   g_warn_if_fail (item->parent_shell == shell);
 
-  g_free (item->label);
-  item->label = NULL;
+  g_free (item->label_label);
+  item->label_label = NULL;
 
   unity_gtk_menu_shell_update_item (shell, item);
 }
@@ -582,6 +582,13 @@
   g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (item));
   g_warn_if_fail (item->parent_shell == shell);
 
+  if (shell->action_group != NULL)
+    {
+      /* If a submenu was added or removed, we need to update the submenu action. */
+      unity_gtk_action_group_disconnect_item (shell->action_group, item);
+      unity_gtk_action_group_connect_item (shell->action_group, item);
+    }
+
   if (item->child_shell_valid)
     {
       GtkMenuShell *old_submenu = item->child_shell != NULL ? item->child_shell->menu_shell : NULL;