Merge lp:~mc-return/unity/unity.merge-fix1006429-fix1006434-fix1063171 into lp:unity

Proposed by MC Return on 2012-10-09
Status: Merged
Merged at revision: 2827
Proposed branch: lp:~mc-return/unity/unity.merge-fix1006429-fix1006434-fix1063171
Merge into: lp:unity
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/unityshell/unityshell.xml.in (+1/-0)
To merge this branch: bzr merge lp:~mc-return/unity/unity.merge-fix1006429-fix1006434-fix1063171
Reviewer Review Type Date Requested Status
Sam Spilsbury 2012-10-09 Pending
Daniel van Vugt 2012-10-09 Pending
Unity Team 2012-10-09 Pending
Review via email: mp+128745@code.launchpad.net

Commit message

Added <feature>showdesktop</feature> to plugins/unityshell.xml.in to print a warning and show a dialogue in CCSM if the user tries to activate the "Show Desktop" or "Fade to Desktop" plug-ins when Unity is enabled.
This also prevents turning the combinations "Unity plug-in + Show Desktop plug-in" and "Unity plug-in + Fade to Desktop plug-in" on as those combinations create multiple bugs.

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 'plugins/unityshell/unityshell.xml.in'
2--- plugins/unityshell/unityshell.xml.in 2012-10-03 20:20:50 +0000
3+++ plugins/unityshell/unityshell.xml.in 2012-10-09 15:41:23 +0000
4@@ -4,6 +4,7 @@
5 <_short>Ubuntu Unity Plugin</_short>
6 <_long>Plugin to draw the Unity Shell</_long>
7 <category>Desktop</category>
8+ <feature>showdesktop</feature>
9 <deps>
10 <relation type="after">
11 <plugin>bailer</plugin>