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

[MC Return]

Unity actually provides the feature "fadetodesktop".
This change is needed to make unityshell just conflict with the Compiz "Fade to Desktop" (fadedesktop) plug-in, but work together with "Show Desktop" (showdesktop).
showdesktop only works if it is started after unityshell.

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/compiz/compiz.merge-fix1067534/+merge/130001

[Omer Akram (om26er)]

this along with compiz fix worked.

review: Approve

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/unity-mbs-autolanding/47/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/47/console
    FAILURE: http://s-jenkins:8080/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/47/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/unity-mbs-autolanding/50/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/50/console
    FAILURE: http://s-jenkins:8080/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/50/console

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2012-10-16 01:12:16 +0000
+++ plugins/unityshell/unityshell.xml.in	2012-10-16 22:27:25 +0000
@@ -4,7 +4,7 @@
         <_short>Ubuntu Unity Plugin</_short>
         <_long>Plugin to draw the Unity Shell</_long>
         <category>Desktop</category>
-        <feature>showdesktop</feature>
+        <feature>fadetodesktop</feature>
         <deps>
             <relation type="after">
                 <plugin>bailer</plugin>