Merge lp:~mterry/appmenu-gtk/blacklist-emacs into lp:appmenu-gtk/0.4

[Michael Terry]

Guh! I give up on emacs. The last straw was that it fleshed out its menus when it got an X button press event. Our code currently handles applications that flesh out menus upon GTK "activate" signals, but not X button presses.

I looked into an emacs patch that watched "activate", but hit problems. I'll look into that further, but for now, I think it's good to have a fallback in place.

I will push another couple branches for dbusmenu that came out of my emacs odyssey.

=== modified file 'src/bridge.c'
--- src/bridge.c	2011-04-12 14:37:43 +0000
+++ src/bridge.c	2011-04-15 18:48:34 +0000
@@ -890,7 +890,8 @@
   return local;
 }
 
-/* crude blacklist to avoid patching innoncent apps */
+/* Crude blacklist to avoid patching innocent apps */
+/* Use xprop | grep CLASS to find the name to use */
 static gboolean
 app_menu_brige_shouldnt_load (void)
 {
@@ -903,6 +904,7 @@
       || (g_strcmp0 (prg, "firefox-bin") == 0)
       || (g_strcmp0 (prg, "thunderbird-bin") == 0)
       || (g_strcmp0 (prg, "Eclipse") == 0)
+      || (g_strcmp0 (prg, "emacs") == 0)
       || (g_strcmp0 (prg, "gnome-panel") == 0))
     {
       return TRUE;