Unity

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

unity.merge-fix1006429-fix1006434-fix1063171
Merge into trunk

Proposed by MC Return on 2012-10-11

Status:

Merged

Approved by:

Łukasz Zemczak on 2012-10-15

Approved revision:

no longer in the source branch.

Merged at revision:

2837

Proposed branch:

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

Merge into:

lp://staging/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://staging/~mc-return/unity/unity.merge-fix1006429-fix1006434-fix1063171

Related bugs:

Bug #1006429: Fade to Desktop plug-in makes windows disappear completely, getting them back to view solely by pressing "Show Desktop" on the Unity panel again	Low	Fix Released
Bug #1006434: Show desktop plug-in fades windows out and ignores movement and movement direction settings completely once unityshell is enabled	Low	Fix Released
Bug #1063171: "Fade to Desktop" and "Show desktop" plug-ins should be automagically disabled and hidden in CCSM if the Ubuntu Unity Plugin is enabled	Low	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Didier Roche-Tolomelli		2012-10-11	Approve on 2012-10-12
jenkins	continuous-integration		Pending
Review via email: mp+129150@code.staging.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.

Description of the change

Adds <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.

Revision history for this message