Midori Web Browser

Merge lp:~kalikiana/midori/saucymenu into lp:midori

  1. saucymenu
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6383
Merged at revision: 6385
Proposed branch: lp:~kalikiana/midori/saucymenu
Merge into: lp:midori
Diff against target: 19 lines (+8/-1)
1 file modified
midori/midori-browser.c (+8/-1)
To merge this branch: bzr merge lp:~kalikiana/midori/saucymenu
Reviewer Review Type Date Requested Status
Midori Devs Pending
Review via email: mp+184184@code.launchpad.net

Commit message

Update condition for UBUNTU_MENUPROXY to work on Saucy

Description of the change

The long-term task would be to use GApplication to install the menu so that Shell, Unity and whatnot work nicely, but that is a ton of work I'm not gonna have time for.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2013-09-03 22:40:32 +0000
3+++ midori/midori-browser.c 2013-09-07 20:23:19 +0000
4@@ -3384,7 +3384,14 @@
5 static const gchar* ubuntu_menuproxy = NULL;
6 if (ubuntu_menuproxy == NULL)
7 ubuntu_menuproxy = g_getenv ("UBUNTU_MENUPROXY");
8- return ubuntu_menuproxy && strstr (ubuntu_menuproxy, ".so") != NULL;
9+ /*
10+ * Values when the global menu is enabled
11+ * UBUNTU_MENUPROXY=libappmenu.so
12+ * UBUNTU_MENUPROXY=1
13+ * The official way to disable the menu is
14+ * UBUNTU_MENUPROXY=
15+ */
16+ return ubuntu_menuproxy && (strstr (ubuntu_menuproxy, ".so") || !strcmp (ubuntu_menuproxy, "1"));
17 }
18
19 static void

Subscribers

People subscribed via source and target branches

to all changes: