Unity

Merge lp:~3v1n0/unity/lim-optional into lp:unity

  1. lim-optional
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3953
Proposed branch: lp:~3v1n0/unity/lim-optional
Merge into: lp:unity
Diff against target: 25 lines (+2/-2)
2 files modified
com.canonical.Unity.gschema.xml (+1/-1)
unity-shared/MenuManager.cpp (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/lim-optional
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Stephen M. Webb (community) Approve
Review via email: mp+256826@code.launchpad.net

Commit message

MenuManager, settings: go back to Global Menus as default

As per design decision.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3953
http://jenkins.qa.ubuntu.com/job/unity-ci/1194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/81
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/81/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1194/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.canonical.Unity.gschema.xml'
2--- com.canonical.Unity.gschema.xml 2015-03-25 14:59:04 +0000
3+++ com.canonical.Unity.gschema.xml 2015-04-20 15:01:28 +0000
4@@ -47,7 +47,7 @@
5 <description>This is used to enable/disable double-click result activation in the dash. Double-click to activate, single click preview</description>
6 </key>
7 <key type="b" name="integrated-menus">
8- <default>true</default>
9+ <default>false</default>
10 <summary>Enable/Disable the integrated menus in Unity.</summary>
11 <description>When this is enabled, the application menus will be shown
12 on the window decoration, otherwise they will be always shown on the
13
14=== modified file 'unity-shared/MenuManager.cpp'
15--- unity-shared/MenuManager.cpp 2015-02-19 19:33:36 +0000
16+++ unity-shared/MenuManager.cpp 2015-04-20 15:01:28 +0000
17@@ -232,7 +232,7 @@
18 };
19
20 Manager::Manager(Indicators::Ptr const& indicators, key::Grabber::Ptr const& grabber)
21- : integrated_menus(true)
22+ : integrated_menus(false)
23 , show_menus_wait(180)
24 , always_show_menus(false)
25 , fadein(100)