Merge lp:~mterry/libdbusmenu/check-gmi-for-accel-closures into lp:libdbusmenu/0.5

[Michael Terry]

In figuring out what the heck is wrong with eclipse, I've discovered that SWT menu items are crazy with respect to menu item accelerators.

They use deprecated direct access to the struct to set the user-visible string, then go and set an accelerator on the menu item directly. Now, at least if they ever plan to move to gtk3, they'll have to fix that, but for now, we should deal with it.

Here's a patch to check the menu item for closures directly, if the accel label doesn't have them. It just grabs the first one if any exist.

=== modified file 'libdbusmenu-gtk/menuitem.c'
--- libdbusmenu-gtk/menuitem.c	2011-03-10 00:43:07 +0000
+++ libdbusmenu-gtk/menuitem.c	2011-03-21 16:11:30 +0000
@@ -236,8 +236,15 @@
                           NULL);
           }
 
-        if (closure == NULL)
-          return FALSE;
+        if (closure == NULL) {
+          /* As a fallback, check for a closure in the related menu item.  This
+             actually happens with SWT menu items. */
+          GList * closures = gtk_widget_list_accel_closures (GTK_WIDGET (gmi));
+          if (closures == NULL)
+            return FALSE;
+          closure = closures->data;
+          g_list_free (closures);
+	}
 
 	GtkAccelGroup * group = gtk_accel_group_from_accel_closure(closure);