summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@beryl-project.org>2007-04-25 01:36:10 +0200
committerDennis Kasprzyk <onestone@beryl-project.org>2007-04-25 01:36:10 +0200
commit5ee129ced78e088f549df9a8e09d26a03bb89dfb (patch)
tree1252561058b895905431f7c7b99229df9cb8c9c4 /src
parente0e8d722de6435c5acb8001833b0fd9e6937ca42 (diff)
downloadbcop-5ee129ced78e088f549df9a8e09d26a03bb89dfb.tar.gz
bcop-5ee129ced78e088f549df9a8e09d26a03bb89dfb.tar.bz2
applied core changes
Diffstat (limited to 'src')
-rw-r--r--src/bcop.xslt24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/bcop.xslt b/src/bcop.xslt
index 891140e..474ad0a 100644
--- a/src/bcop.xslt
+++ b/src/bcop.xslt
@@ -866,8 +866,11 @@ void </xsl:text>
<xsl:text>:
if (</xsl:text>
<xsl:choose>
- <xsl:when test="@type='action'">
- <xsl:text>setDisplayAction (d, o, value))</xsl:text>
+ <xsl:when test="ancestor::display">
+ <xsl:text>compSetDisplayOption (d, o, value))</xsl:text>
+ </xsl:when>
+ <xsl:when test="ancestor::screen">
+ <xsl:text>compSetScreenOption (s, o, value))</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>compSetOption (o, value))</xsl:text>
@@ -1023,12 +1026,6 @@ void </xsl:text>
</xsl:if>
</xsl:for-each>
- <xsl:for-each select="/compiz/plugin[@name=$pName]/display//option[@type = 'action']">
- <xsl:text> addScreenAction (s, &amp;od->opt[</xsl:text>
- <xsl:call-template name="printOptionsEnumName"/>
- <xsl:text>].value.action);
-</xsl:text>
- </xsl:for-each>
<xsl:text> if (</xsl:text>
<xsl:value-of select="$plugin"/>
<xsl:text>PluginVTable &amp;&amp; </xsl:text>
@@ -1054,21 +1051,10 @@ static void </xsl:text>
<xsl:text>PluginVTable->finiScreen (p, s);
</xsl:text>
- <xsl:if test="/compiz/plugin[@name=$pName]/display//option[@type = 'action']">
- <xsl:value-of select="$PLUGIN"/>
- <xsl:text>_OPTIONS_DISPLAY (s->display);
- </xsl:text>
- </xsl:if>
<xsl:value-of select="$PLUGIN"/>
<xsl:text>_OPTIONS_SCREEN (s);
</xsl:text>
- <xsl:for-each select="/compiz/plugin[@name=$pName]/display//option[@type = 'action']">
- <xsl:text> removeScreenAction (s, &amp;od->opt[</xsl:text>
- <xsl:call-template name="printOptionsEnumName"/>
- <xsl:text>].value.action);
-</xsl:text>
- </xsl:for-each>
<xsl:if test="/compiz/plugin[@name=$pName]/screen//option">
<xsl:text>
compFiniScreenOptions (s, os->opt, </xsl:text>