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

[William Hua]

Forward original accelerator text for Eclipse, Inkscape, Emacs.

Forward original accelerator text for Eclipse, Inkscape, Emacs.

This branch needs https://code.launchpad.net/~attente/gtk/x-canonical-accel/+merge/213395.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Will, I'm not sure that I understand this patch. Where does the x-canonical-accel attribute get used?

[Charles Kerr (charlesk)]

Oh of course, in https://code.launchpad.net/~attente/gtk/x-canonical-accel/+merge/213395

This side of the patch looks fine.

review: Approve

=== modified file 'lib/unity-gtk-menu-item-private.h'
--- lib/unity-gtk-menu-item-private.h	2014-03-25 21:48:16 +0000
+++ lib/unity-gtk-menu-item-private.h	2014-03-31 01:05:21 +0000
@@ -89,6 +89,9 @@
 void                unity_gtk_menu_item_print             (UnityGtkMenuItem  *item,
                                                            guint              indent)       G_GNUC_INTERNAL;
 
+GtkLabel *          gtk_menu_item_get_nth_label           (GtkMenuItem       *menu_item,
+                                                           guint              index)        G_GNUC_INTERNAL;
+
 const gchar *       gtk_menu_item_get_nth_label_label     (GtkMenuItem       *menu_item,
                                                            guint              index)        G_GNUC_INTERNAL;
 

=== modified file 'lib/unity-gtk-menu-item.c'
--- lib/unity-gtk-menu-item.c	2014-03-27 19:52:20 +0000
+++ lib/unity-gtk-menu-item.c	2014-03-31 01:05:21 +0000
@@ -57,7 +57,7 @@
     }
 }
 
-static GtkLabel *
+GtkLabel *
 gtk_menu_item_get_nth_label (GtkMenuItem *menu_item,
                              guint        index)
 {
@@ -368,6 +368,23 @@
 }
 
 static void
+unity_gtk_menu_item_handle_accel_closures_changed (GtkWidget *widget,
+                                                   gpointer   user_data)
+{
+  UnityGtkMenuItem *item;
+  UnityGtkMenuShell *parent_shell;
+
+  g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (user_data));
+
+  item = UNITY_GTK_MENU_ITEM (user_data);
+  parent_shell = item->parent_shell;
+
+  g_return_if_fail (parent_shell != NULL);
+
+  unity_gtk_menu_shell_handle_item_notify (parent_shell, item, "accel-path");
+}
+
+static void
 unity_gtk_menu_item_set_menu_item (UnityGtkMenuItem *item,
                                    GtkMenuItem      *menu_item)
 {
@@ -410,6 +427,8 @@
           if (label != NULL)
             g_signal_connect (label, "notify", G_CALLBACK (unity_gtk_menu_item_handle_label_notify), item);
 
+          g_signal_connect (menu_item, "accel-closures-changed", G_CALLBACK (unity_gtk_menu_item_handle_accel_closures_changed), item);
+
           /* LP: #1208019 */
           if (gtk_menu_item_get_submenu (menu_item) != NULL)
             g_signal_emit_by_name (gtk_menu_item_get_submenu (menu_item), "show");

=== modified file 'lib/unity-gtk-menu-section.c'
--- lib/unity-gtk-menu-section.c	2014-03-25 21:48:16 +0000
+++ lib/unity-gtk-menu-section.c	2014-03-31 01:05:21 +0000
@@ -23,6 +23,10 @@
 #define G_MENU_ATTRIBUTE_ACCEL "accel"
 #endif
 
+#ifndef G_MENU_ATTRIBUTE_ACCEL_TEXT
+#define G_MENU_ATTRIBUTE_ACCEL_TEXT "x-canonical-accel"
+#endif
+
 G_DEFINE_TYPE (UnityGtkMenuSection,
                unity_gtk_menu_section,
                G_TYPE_MENU_MODEL);
@@ -35,6 +39,14 @@
   return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
 }
 
+static gboolean
+g_closure_equal (GtkAccelKey *key,
+                 GClosure    *closure,
+                 gpointer     data)
+{
+  return closure == data;
+}
+
 static void
 unity_gtk_menu_section_set_parent_shell (UnityGtkMenuSection *section,
                                          UnityGtkMenuShell   *parent_shell)
@@ -166,10 +178,49 @@
         }
 
       if (accel_name == NULL)
-        accel_name = g_strdup (gtk_menu_item_get_nth_label_label (item->menu_item, 1));
+        {
+          GList *closures = gtk_widget_list_accel_closures (GTK_WIDGET (item->menu_item));
+          GList *iter;
+
+          for (iter = closures; iter != NULL && accel_name == NULL; iter = g_list_next (iter))
+            {
+              GClosure *closure = iter->data;
+              GtkAccelGroup *accel_group = gtk_accel_group_from_accel_closure (closure);
+
+              if (accel_group != NULL)
+                {
+                  GtkAccelKey *accel_key = gtk_accel_group_find (accel_group, g_closure_equal, closure);
+
+                  if (accel_key != NULL)
+                    accel_name = gtk_accelerator_name (accel_key->accel_key, accel_key->accel_mods);
+                }
+            }
+
+          g_list_free (closures);
+        }
 
       if (accel_name != NULL)
         g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_ACCEL, g_variant_ref_sink (g_variant_new_string (accel_name)));
+      else
+        {
+#if GTK_MAJOR_VERSION == 2
+          /* LP: #1208019 */
+          GtkLabel *accel_label = gtk_menu_item_get_nth_label (item->menu_item, 0);
+
+          if (GTK_IS_ACCEL_LABEL (accel_label))
+            {
+              /* Eclipse uses private API. */
+              if (GTK_ACCEL_LABEL (accel_label)->accel_string != NULL)
+                accel_name = g_strdup (GTK_ACCEL_LABEL (accel_label)->accel_string);
+            }
+#endif
+
+          if (accel_name == NULL)
+            accel_name = g_strdup (gtk_menu_item_get_nth_label_label (item->menu_item, 1));
+
+          if (accel_name != NULL)
+            g_hash_table_insert (*attributes, G_MENU_ATTRIBUTE_ACCEL_TEXT, g_variant_ref_sink (g_variant_new_string (accel_name)));
+        }
 
       g_free (accel_name);
     }