diff options
| author | Dennis Kasprzyk <onestone@compiz-fusion.org> | 2008-09-16 18:07:58 +0200 |
|---|---|---|
| committer | Dennis Kasprzyk <onestone@compiz-fusion.org> | 2008-09-16 18:07:58 +0200 |
| commit | d5c1735d31485cfbcb8502a1489a5ad88b692905 (patch) | |
| tree | c5004db14e280ead3549e2479a0889449d77d4ff /metadata | |
| parent | 040ea62ad74a88b3b12a90e48c038edab740cb60 (diff) | |
| download | zcomp-d5c1735d31485cfbcb8502a1489a5ad88b692905.tar.gz zcomp-d5c1735d31485cfbcb8502a1489a5ad88b692905.tar.bz2 | |
Apply core changes to metadata convertors.
Diffstat (limited to 'metadata')
| -rw-r--r-- | metadata/kcfg.xslt | 6 | ||||
| -rw-r--r-- | metadata/schemas.xslt | 11 |
2 files changed, 4 insertions, 13 deletions
diff --git a/metadata/kcfg.xslt b/metadata/kcfg.xslt index c8b52b5..71d51eb 100644 --- a/metadata/kcfg.xslt +++ b/metadata/kcfg.xslt @@ -34,7 +34,7 @@ <kcfgfile name="compizrc"> <parameter name="screen"/> </kcfgfile> - <xsl:for-each select="/compiz/*/display | /compiz/*/screen"> + <xsl:for-each select="/compiz/*/options"> <group> <xsl:variable name="group"> <xsl:choose> @@ -50,9 +50,7 @@ </xsl:variable> <xsl:attribute name='name'> <xsl:value-of select="$group"/> - <xsl:if test="name() = 'screen'"> - <xsl:text>$(screen)</xsl:text> - </xsl:if> + <xsl:text>$(screen)</xsl:text> </xsl:attribute> <xsl:for-each select="option[not(@read_only='true') and not(@type='action')]"> <xsl:call-template name="print_option"> diff --git a/metadata/schemas.xslt b/metadata/schemas.xslt index 141eb93..4f948de 100644 --- a/metadata/schemas.xslt +++ b/metadata/schemas.xslt @@ -31,7 +31,7 @@ <xsl:template match="/compiz"> <gconfschemafile> <schemalist> - <xsl:for-each select="/compiz//option[not(@read_only='true') and not(@type='action')]"> + <xsl:for-each select="/compiz//options/option[not(@read_only='true') and not(@type='action')]"> <xsl:call-template name="dumpOption"/> </xsl:for-each> </schemalist> @@ -392,14 +392,7 @@ <xsl:text>/general</xsl:text> </xsl:otherwise> </xsl:choose> - <xsl:choose> - <xsl:when test="ancestor::screen"> - <xsl:text>/screen0/options/</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>/allscreens/options/</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:text>/screen0/options/</xsl:text> <xsl:value-of select="@name"/> </xsl:template> |