← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~dbarth/appmenu-gtk/no-proxy-module-for-mutter into lp:appmenu-gtk

 

David Barth has proposed merging lp:~dbarth/appmenu-gtk/no-proxy-module-for-mutter into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)


Blacklist mutter to avoid the menubar locking the whole unity process
-- 
https://code.launchpad.net/~dbarth/appmenu-gtk/no-proxy-module-for-mutter/+merge/27911
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.
=== modified file 'src/bridge.c'
--- src/bridge.c	2010-06-17 17:53:53 +0000
+++ src/bridge.c	2010-06-18 09:17:23 +0000
@@ -688,13 +688,14 @@
   return (g_strcmp0 (env, "1") == 0);
 }
 
-/* crude blacklist to avoid to much patching for now */
+/* crude blacklist to avoid patching innoncent apps */
 static gboolean
 app_menu_brige_shouldnt_load (void)
 {
 	const char *prg = g_get_prgname ();
 
-	if (g_strrstr (prg, "indicator-applet") != NULL) {
+	if ((g_strrstr (prg, "indicator-applet") != NULL)
+		|| (g_strcmp0 (prg, "mutter") == 0)) {
 		g_print ("*** Warning: menu proxy blacklisting: %s\n", prg);
 		return TRUE;
 	}


Follow ups