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

[William Hua]

Fix regression on GtkRecentChooserMenus. (LP: #1243974)

Fix regression on GtkRecentChooserMenus. (LP: #1243974)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'lib/unity-gtk-action-group.c'
--- lib/unity-gtk-action-group.c	2013-02-19 11:55:57 +0000
+++ lib/unity-gtk-action-group.c	2013-11-28 18:39:29 +0000
@@ -394,8 +394,8 @@
               name = g_variant_get_string (parameter, NULL);
               item = g_hash_table_lookup (action->items_by_name, name);
 
-              if (item != NULL && item->menu_item != NULL)
-                gtk_menu_item_activate (item->menu_item);
+              if (item != NULL)
+                unity_gtk_menu_item_activate (item);
 
               g_action_group_action_state_changed (G_ACTION_GROUP (group), action->name, parameter);
             }
@@ -406,8 +406,7 @@
               else
                 g_warn_if_fail (parameter == NULL);
 
-              if (action->item->menu_item != NULL)
-                gtk_menu_item_activate (action->item->menu_item);
+              unity_gtk_menu_item_activate (action->item);
             }
 
           return;

=== modified file 'lib/unity-gtk-menu-item-private.h'
--- lib/unity-gtk-menu-item-private.h	2013-06-17 17:32:33 +0000
+++ lib/unity-gtk-menu-item-private.h	2013-11-28 18:39:29 +0000
@@ -84,6 +84,8 @@
 
 gboolean            unity_gtk_menu_item_get_draw_as_radio (UnityGtkMenuItem  *item)         G_GNUC_INTERNAL;
 
+void                unity_gtk_menu_item_activate          (UnityGtkMenuItem  *item)         G_GNUC_INTERNAL;
+
 void                unity_gtk_menu_item_print             (UnityGtkMenuItem  *item,
                                                            guint              indent)       G_GNUC_INTERNAL;
 

=== modified file 'lib/unity-gtk-menu-item.c'
--- lib/unity-gtk-menu-item.c	2013-07-09 17:25:52 +0000
+++ lib/unity-gtk-menu-item.c	2013-11-28 18:39:29 +0000
@@ -425,8 +425,13 @@
         {
           UnityGtkMenuShell *parent_shell = item->parent_shell;
 
-          if (parent_shell != NULL && parent_shell->action_group != NULL)
-            unity_gtk_action_group_connect_shell (parent_shell->action_group, item->child_shell);
+          if (parent_shell != NULL)
+            {
+              if (parent_shell->action_group != NULL)
+                unity_gtk_action_group_connect_shell (parent_shell->action_group, item->child_shell);
+            }
+          else
+            g_warn_if_reached ();
         }
     }
 
@@ -563,6 +568,15 @@
 }
 
 void
+unity_gtk_menu_item_activate (UnityGtkMenuItem *item)
+{
+  g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (item));
+  g_return_if_fail (item->parent_shell != NULL);
+
+  unity_gtk_menu_shell_activate_item (item->parent_shell, item);
+}
+
+void
 unity_gtk_menu_item_print (UnityGtkMenuItem *item,
                            guint             indent)
 {

=== modified file 'lib/unity-gtk-menu-shell-private.h'
--- lib/unity-gtk-menu-shell-private.h	2013-02-19 11:55:57 +0000
+++ lib/unity-gtk-menu-shell-private.h	2013-11-28 18:39:29 +0000
@@ -37,6 +37,9 @@
                                                                UnityGtkMenuItem  *item,
                                                                GParamSpec        *pspec)  G_GNUC_INTERNAL;
 
+void               unity_gtk_menu_shell_activate_item         (UnityGtkMenuShell *shell,
+                                                               UnityGtkMenuItem  *item)   G_GNUC_INTERNAL;
+
 void               unity_gtk_menu_shell_print                 (UnityGtkMenuShell *shell,
                                                                guint              indent) G_GNUC_INTERNAL;
 

=== modified file 'lib/unity-gtk-menu-shell.c'
--- lib/unity-gtk-menu-shell.c	2013-07-08 19:53:09 +0000
+++ lib/unity-gtk-menu-shell.c	2013-11-28 18:39:29 +0000
@@ -972,6 +972,22 @@
 }
 
 void
+unity_gtk_menu_shell_activate_item (UnityGtkMenuShell *shell,
+                                    UnityGtkMenuItem  *item)
+{
+  g_return_if_fail (UNITY_GTK_IS_MENU_SHELL (shell));
+  g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (item));
+
+  if (item->menu_item != NULL)
+    {
+      if (GTK_IS_MENU (shell->menu_shell))
+        gtk_menu_set_active (GTK_MENU (shell->menu_shell), item->item_index);
+
+      gtk_menu_item_activate (item->menu_item);
+    }
+}
+
+void
 unity_gtk_menu_shell_print (UnityGtkMenuShell *shell,
                             guint              indent)
 {