Merge lp:~mc-return/compiz/compiz.merge-fix1067534 into lp:compiz/0.9.9

[MC Return]

Make sure showdesktop is loaded after unityshell.
(LP: #1067534)

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.

Problem:
The default behaviour (before recent fixes) was loading the showdesktop plug-in before unityshell, which prevented it from working with Unity.
Currently it is prohibited to start this plug-in together with Unity (so it is either showdesktop or unityshell).

Solution:
We have to make sure that showdesktop is loaded after unityshell to allow the user to use it's functionality.
The fix should involve the possibility to enable this plug-in in CCSM together with Unity and to ensure that the plug-in is loaded after unityshell.

The "Fade to Desktop" plug-in provides essentially the same functionality like already provided by unityshell (fade to desktop), the only difference is that you can adjust the fade time with it.
Unfortunately this plug-in still makes some troubles, like a popping fade-out, so it will be best to not change current behaviour and prohibit the user using it together with Unity.

[MC Return (mc-return)]

See also: https://code.launchpad.net/~mc-return/unity/unity.merge-fix1067534/+merge/129999

[Omer Akram (om26er)]

WFM

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/27/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/27/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/28/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/28/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/29/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/29/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Works for me.

review: Approve

=== modified file 'plugins/fadedesktop/fadedesktop.xml.in'
--- plugins/fadedesktop/fadedesktop.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/fadedesktop/fadedesktop.xml.in	2012-10-16 22:23:59 +0000
@@ -18,6 +18,7 @@
 	    </relation>
 	</deps>
 	<feature>showdesktop</feature>
+	<feature>fadetodesktop</feature>
 	<options>
 	    <option name="fadetime" type="int">
 		<_short>Fade Time</_short>

=== modified file 'plugins/showdesktop/showdesktop.xml.in'
--- plugins/showdesktop/showdesktop.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/showdesktop/showdesktop.xml.in	2012-10-16 22:23:59 +0000
@@ -14,6 +14,7 @@
 	    <plugin>opengl</plugin>
 	    <plugin>fade</plugin>
 	    <plugin>decor</plugin>
+	    <plugin>unityshell</plugin>
 	</relation>
     </deps>
     <options>