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

[Marco Trevisan (Treviño)]

MenuManager, settings: go back to Global Menus as default

As per design decision.

[Stephen M. Webb (bregma)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2015-03-25 14:59:04 +0000
+++ com.canonical.Unity.gschema.xml	2015-04-20 15:01:28 +0000
@@ -47,7 +47,7 @@
       <description>This is used to enable/disable double-click result activation in the dash. Double-click to activate, single click preview</description>
     </key>
     <key type="b" name="integrated-menus">
-      <default>true</default>
+      <default>false</default>
       <summary>Enable/Disable the integrated menus in Unity.</summary>
       <description>When this is enabled, the application menus will be shown
         on the window decoration, otherwise they will be always shown on the
 
=== modified file 'unity-shared/MenuManager.cpp'
--- unity-shared/MenuManager.cpp	2015-02-19 19:33:36 +0000
+++ unity-shared/MenuManager.cpp	2015-04-20 15:01:28 +0000
@@ -232,7 +232,7 @@
 };
 
 Manager::Manager(Indicators::Ptr const& indicators, key::Grabber::Ptr const& grabber)
-  : integrated_menus(true)
+  : integrated_menus(false)
   , show_menus_wait(180)
   , always_show_menus(false)
   , fadein(100)