Unity

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

  1. unity6.0.merge-fix1006429-fix1006434-fix1063171
  2. Merge into 6.0
Proposed by MC Return on 2012-10-15
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-10-15
Approved revision: 2778
Merged at revision: 2781
Proposed branch: lp:~mc-return/unity/unity6.0.merge-fix1006429-fix1006434-fix1063171
Merge into: lp:unity/6.0
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/unity6.0.merge-fix1006429-fix1006434-fix1063171
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2012-10-15 Approve on 2012-10-15
Review via email: mp+129636@code.launchpad.net

Commit Message

Added <feature>showdesktop</feature> to unityshell.xml.in, because the feature showdesktop is provided by unityshell.
Now it will be impossible to enable the Compiz "Show Desktop" and "Fade to Desktop" plug-ins together with Unity, but they will work normally without Unity.
CCSM will show a dialogue to the user if he tries to enable showdesktop or fadetodesktop if Unity runs, explaining the situation and allowing the user to choose.

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks fine, thanks.

review: Approve

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-09-07 15:49:40 +0000
3+++ plugins/unityshell/unityshell.xml.in 2012-10-15 09:54:20 +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>

Subscribers

People subscribed via source and target branches

to all changes: