ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/appmenu-gtk/no-firefox into lp:appmenu-gtk.

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


I haven't been able to reproduce any Firefox crashers, but Chris Coulson was complaining about it on #desktop-devel earlier so I'm adding "firefox-bin" to the list of apps we are refusing to load for.
-- 
https://code.launchpad.net/~bratsche/appmenu-gtk/no-firefox/+merge/29048
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-06-29 16:08:41 +0000
+++ src/bridge.c	2010-07-02 03:05:38 +0000
@@ -839,16 +839,18 @@
 static gboolean
 app_menu_brige_shouldnt_load (void)
 {
-	const char *prg = g_get_prgname ();
-
-	if ((g_strrstr (prg, "indicator-applet") != NULL)
-		|| (g_strcmp0 (prg, "indicator-loader") == 0)
-		|| (g_strcmp0 (prg, "mutter") == 0)) {
-		g_print ("*** Warning: menu proxy blacklisting: %s\n", prg);
-		return TRUE;
-	}
-
-	return FALSE;
+  const char *prg = g_get_prgname ();
+
+  if ((g_strrstr (prg, "indicator-applet") != NULL)
+      || (g_strcmp0 (prg, "indicator-loader") == 0)
+      || (g_strcmp0 (prg, "mutter") == 0)
+      || (g_strcmp0 (prg, "firefox-bin") == 0))
+    {
+      g_print ("*** Warning: menu proxy blacklisting: %s\n", prg);
+      return TRUE;
+    }
+
+  return FALSE;
 }