Merge lp:~attente/unity/1284532 into lp:unity

[William Hua]

Unity shell plugin conflicts with gnomecompat.

Unity shell plugin conflicts with gnomecompat.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3703
http://jenkins.qa.ubuntu.com/job/unity-ci/782/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/316

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/782/rebuild

review: Approve (continuous-integration)

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

Thanks

review: Approve

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2014-02-25 09:33:43 +0000
+++ plugins/unityshell/unityshell.xml.in	2014-03-10 16:43:41 +0000
@@ -23,7 +23,6 @@
                 <plugin>cube</plugin>
                 <plugin>rotate</plugin>
                 <plugin>cubeaddon</plugin>
-                <plugin>gnomecompat</plugin>
                 <plugin>vpswitch</plugin>
                 <plugin>fade</plugin>
                 <plugin>staticswitcher</plugin>
@@ -44,6 +43,7 @@
             <conflict>
                 <plugin>decor</plugin>
                 <plugin>scalefilter</plugin>
+                <plugin>gnomecompat</plugin>
             </conflict>
         </deps>