Merge lp:~charlesk/appmenu-gtk/lp-788640 into lp:appmenu-gtk/12.10

[Charles Kerr]

wicd-gtk's toolbar has a menu which appmenu-gtk exports to the Global Menu. Users don't think to look there because wicd-gtk has no traditional menubar at all, so the end result is confusing to users.

Adding wicd-gtk to appmenu-gtk's list of apps to not export to the Global Menu is one way to avoid this confusion.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/./label=precise/4/console

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

review: Approve

=== modified file 'src/bridge.c'
--- src/bridge.c	2012-04-02 19:12:37 +0000
+++ src/bridge.c	2012-05-07 18:53:18 +0000
@@ -955,6 +955,7 @@
       || (g_strcmp0 (prg, "emacs23-lucid") == 0)
       || (g_strcmp0 (prg, "glade") == 0)
       || (g_strcmp0 (prg, "gnome-panel") == 0)
+      || (g_strcmp0 (prg, "wicd-client.py") == 0)
       || (g_strcmp0 (prg, "Lotus Notes") == 0))
     {
       return TRUE;