Merge lp:~mc-return/unity/unity.merge-fix1006429-fix1006434-fix1063171 into lp:unity
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Zemczak |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2837 |
| 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 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Didier Roche-Tolomelli | Approve | ||
| jenkins | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit message
Added <feature>
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>
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.
Looking sane! Thanks a lot :)