Merge lp://qastaging/~mc-return/compiz/compiz0.9.8.merge-fix1067534 into lp://qastaging/compiz/0.9.8

Proposed by MC Return
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 3410
Merged at revision: 3409
Proposed branch: lp://qastaging/~mc-return/compiz/compiz0.9.8.merge-fix1067534
Merge into: lp://qastaging/compiz/0.9.8
Diff against target: 23 lines (+2/-0)
2 files modified
plugins/fadedesktop/fadedesktop.xml.in (+1/-0)
plugins/showdesktop/showdesktop.xml.in (+1/-0)
To merge this branch: bzr merge lp://qastaging/~mc-return/compiz/compiz0.9.8.merge-fix1067534
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+130144@code.qastaging.launchpad.net

Commit message

Make sure showdesktop is loaded after unityshell.
fadedesktop conflicts with unityshell and showdesktop now.
showdesktop still conflicts with fadesktop, but not with unityshell anymore.

Together with the fix for Unity this allows the CCSM user to use the full functionality of the "Show Desktop" plug-in together with Unity-3d for the first time, namely sliding windows out of view to show the desktop and sliding them back in to restore the previous state.

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote :

This fix should ideally be applied first, then this one: https://code.launchpad.net/~mc-return/unity/unity6.0.merge-fix1067534/+merge/130145

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches