Merge lp:~attente/unity-gtk-module/unset-ubuntu-menuproxy into lp:unity-gtk-module/13.10

[William Hua]

Before, we would have to explicitly set UBUNTU_MENUPROXY to '', '0', 'no', 'off', or 'false' to disable u-g-m. Now, unsetting UBUNTU_MENUPROXY will also disable it.

Before, we would have to explicitly set UBUNTU_MENUPROXY to '', '0', 'no', 'off', or 'false' to disable u-g-m. Now, unsetting UBUNTU_MENUPROXY will also disable it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-amd64-ci/5
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-armhf-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-gtk-module-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

This is insane.

review: Disapprove

[Ted Gould (ted)]

I think that we need this so that people have been previously told that unsetting the variable in their program to disable the global menu would work, can still have their app working. I agree that it isn't beautiful, but it is required to maintain compatibility.

review: Approve

[Diogo Baeder (diogobaeder)]

Hi,

Currently WingIDE 4 (at least the Professional version, which I use) breaks in Saucy Salamander, as its top menu items get messed up and don't drop down, when it gets merged with the global menu. I talked to the developers, and they told that one of the alternatives would be to disable the global menu for WingIDE, by making it a local menu. Currently I do this by not using the system-wide GTK theme, because the UBUNTU_MENUPROXY variable is not working as expected - setting it to '', '0', 'no', 'off', or 'false' don't seem to change this behaviour -.

So I think this change will make WingIDE 4 able to work normally again in Saucy, by not using the global menu.

Thanks!

[William Hua (attente)]

Hi Diogo,

This merge is very small; if setting UBUNTU_MENUPROXY to '', '0', etc. isn't working, this won't fix it, and what you have is a different bug and should probably be reported as such...

Unmerged revisions

297. By William Hua on 2013-07-02

Before, we would have to explicitly set UBUNTU_MENUPROXY to '', '0', 'no', 'off', or 'false' to disable u-g-m. Now, unsetting UBUNTU_MENUPROXY will also disable it.

=== modified file 'src/main.c'
--- src/main.c	2013-03-14 17:09:54 +0000
+++ src/main.c	2013-07-02 16:39:27 +0000
@@ -759,7 +759,7 @@
 {
   const gchar *proxy = g_getenv ("UBUNTU_MENUPROXY");
 
-  if ((proxy == NULL || is_true (proxy)) && !is_blacklisted (g_get_prgname ()))
+  if (is_true (proxy) && !is_blacklisted (g_get_prgname ()))
     {
       GtkWidgetClass *widget_class;