summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@beryl-project.org>2007-04-23 17:24:46 +0200
committerDennis Kasprzyk <onestone@beryl-project.org>2007-04-23 17:24:46 +0200
commit5ed343ebd7a97f49b57e9ac85d98c790aeb801d3 (patch)
tree6cc90a6ec21396ca63977b361ddbc87a0131464a
parentc032937384df7b0fcb60df096eb361a3f6b7fad1 (diff)
parentfa5ace6c98d48eec75c68094c22f33df906c0d2e (diff)
downloadberyl-premerge-5ed343ebd7a97f49b57e9ac85d98c790aeb801d3.tar.gz
beryl-premerge-5ed343ebd7a97f49b57e9ac85d98c790aeb801d3.tar.bz2
Merge branch 'master' of git+ssh://git.beryl-project.org/git/compiz/compiz-plugins-beryl-premerge
-rw-r--r--metadata/addhelper.xml3
-rw-r--r--metadata/fadedesktop.xml3
-rw-r--r--metadata/group.xml2
-rw-r--r--metadata/opacify.xml3
-rw-r--r--metadata/snap.xml1
-rw-r--r--metadata/trailfocus.xml1
-rw-r--r--metadata/wall.xml4
7 files changed, 8 insertions, 9 deletions
diff --git a/metadata/addhelper.xml b/metadata/addhelper.xml
index 1f1a9d5..e2a733f 100644
--- a/metadata/addhelper.xml
+++ b/metadata/addhelper.xml
@@ -2,7 +2,8 @@
<compiz>
<plugin name="addhelper" useBcop="true">
<short>AddHelper</short>
- <long>Make it slightly easier to concentrate by dimming all but the active window.</long>
+ <long>Make it slightly easier to concentrate by dimming all but the active window.</long>
+ <rule type="after">fade</rule>
<display>
<group>
<short>Bindings</short>
diff --git a/metadata/fadedesktop.xml b/metadata/fadedesktop.xml
index 8894c10..e0b81be 100644
--- a/metadata/fadedesktop.xml
+++ b/metadata/fadedesktop.xml
@@ -2,7 +2,8 @@
<compiz>
<plugin name="fadedesktop" useBcop="true">
<short>Fade to Desktop</short>
- <long>Easily access your desktop</long>
+ <long>Easily access your desktop</long>
+ <rule type="before">fade</rule>
<feature>showdesktop</feature>
<screen>
<option name="fadetime" type="int">
diff --git a/metadata/group.xml b/metadata/group.xml
index d7f9a29..e5383ba 100644
--- a/metadata/group.xml
+++ b/metadata/group.xml
@@ -4,9 +4,7 @@
<short>Group and Tab Windows</short>
<long>With this plugin you can group and tab windows</long>
<rule type="after">fade</rule>
- <rule type="require">fade</rule>
<rule type="after">place</rule>
- <rule type="require">place</rule>
<display>
<group>
<short>Selection</short>
diff --git a/metadata/opacify.xml b/metadata/opacify.xml
index e50a13d..8cf0750 100644
--- a/metadata/opacify.xml
+++ b/metadata/opacify.xml
@@ -2,7 +2,8 @@
<compiz>
<plugin name="opacify" useBcop="true">
<short>Opacify</short>
- <long>Make windows easily visible by hovering the mouse over them</long>
+ <long>Make windows easily visible by hovering the mouse over them</long>
+ <rule type="after">fade</rule>
<display>
<group>
<short>Bindings</short>
diff --git a/metadata/snap.xml b/metadata/snap.xml
index 64ab798..a6a1ab6 100644
--- a/metadata/snap.xml
+++ b/metadata/snap.xml
@@ -5,7 +5,6 @@
<long>Enables windows edges resistance</long>
<feature>edgeresistance</feature>
<rule type="after">decoration</rule>
- <rule type="require">decoration</rule>
<display>
<group>
<short>Bindings</short>
diff --git a/metadata/trailfocus.xml b/metadata/trailfocus.xml
index 57b3b97..a7e0d50 100644
--- a/metadata/trailfocus.xml
+++ b/metadata/trailfocus.xml
@@ -4,7 +4,6 @@
<short>Trailfocus</short>
<long>Adjust the opacity, saturation and brightness of windows based on when they last had focus.</long>
<rule type="after">fade</rule>
- <rule type="require">fade</rule>
<screen>
<group>
<short>Behaviour</short>
diff --git a/metadata/wall.xml b/metadata/wall.xml
index 3f20861..ba352ac 100644
--- a/metadata/wall.xml
+++ b/metadata/wall.xml
@@ -4,8 +4,8 @@
<short>Desktop Wall</short>
<long>Desktop Wall Plugin</long>
<feature>largedesktop</feature>
- <rule type="after">decoration</rule>
- <rule type="require">decoration</rule>
+ <rule type="after">decoration</rule>
+ <rule type="before">fade</rule>
<display>
<group>
<short>Misc. Settings</short>