Modifies new attribute from previous patch so that it need only be used

on extensions with split names.

diff --git a/src/bigreq.xml b/src/bigreq.xml
index d58a084..3cca2f7 100644 (file)
--- a/src/bigreq.xml
+++ b/src/bigreq.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <xcb header="bigreq" extension-xname="BIG-REQUESTS"
-    extension-name="BigRequests"
+    extension-name="BigRequests" extension-multiword="true"
     major-version="0" minor-version="0">
 
   <request name="Enable" opcode="0">

diff --git a/src/randr.xml b/src/randr.xml
index 6a140de..352b1e1 100644 (file)
--- a/src/randr.xml
+++ b/src/randr.xml
@@ -27,7 +27,7 @@ authorization from the authors.
 -->
 
 <xcb header="randr" extension-xname="RANDR" extension-name="RandR"
-    extension-oneword="true" major-version="1" minor-version="2">
+    major-version="1" minor-version="2">
 
        <import>xproto</import>
        

diff --git a/src/screensaver.xml b/src/screensaver.xml
index 311475b..8acd292 100644 (file)
--- a/src/screensaver.xml
+++ b/src/screensaver.xml
@@ -29,7 +29,7 @@ authorization from the authors.
 Screen Saver Extension to the X Protocol
 Draft Standard Version 1.1
 -->
-<xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver" extension-oneword="true" major-version="1" minor-version="1">
+<xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver" major-version="1" minor-version="1">
 
   <!-- Types -->
 

diff --git a/src/xc_misc.xml b/src/xc_misc.xml
index 18f5a84..139ca22 100644 (file)
--- a/src/xc_misc.xml
+++ b/src/xc_misc.xml
@@ -5,7 +5,7 @@ All Rights Reserved.  See the file COPYING in this directory
 for licensing information.
 -->
 <xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc"
-    major-version="1" minor-version="1">
+    extension-multiword="true" major-version="1" minor-version="1">
   <request name="GetVersion" opcode="0">
     <field type="CARD16" name="client_major_version" />
     <field type="CARD16" name="client_minor_version" />

diff --git a/src/xcb.xsd b/src/xcb.xsd
index ae62799..b40ee6a 100644 (file)
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -33,7 +33,7 @@ authorization from the authors.
       <xsd:attribute name="header" type="xsd:string" use="required" />
       <xsd:attribute name="extension-xname" type="xsd:string" use="optional" />
       <xsd:attribute name="extension-name"  type="xsd:string" use="optional" />
-      <xsd:attribute name="extension-oneword" type="xsd:boolean" use="optional" default="false" />
+      <xsd:attribute name="extension-multiword" type="xsd:boolean" use="optional" default="false" />
       <xsd:attribute name="major-version"   type="xsd:integer" use="optional" />
       <xsd:attribute name="minor-version"   type="xsd:integer" use="optional" />
     </xsd:complexType>

diff --git a/src/xf86dri.xml b/src/xf86dri.xml
index 65fbe55..c05b724 100644 (file)
--- a/src/xf86dri.xml
+++ b/src/xf86dri.xml
@@ -27,7 +27,7 @@ authorization from the authors.
 -->
 
 <xcb header="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri"
-    extension-oneword="true" major-version="4" minor-version="1">
+    major-version="4" minor-version="1">
 
     <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
 

diff --git a/src/xfixes.xml b/src/xfixes.xml
index 7565920..203c2a8 100644 (file)
--- a/src/xfixes.xml
+++ b/src/xfixes.xml
@@ -26,7 +26,7 @@ authorization from the authors.
 -->
 <!-- This file describes version 4 of XFixes. -->
 <xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes"
-    extension-oneword="true" major-version="4" minor-version="0">
+    major-version="4" minor-version="0">
   <import>xproto</import>
   <import>render</import>
   <import>shape</import>

diff --git a/src/xprint.xml b/src/xprint.xml
index 040b353..1fa2ab6 100644 (file)
--- a/src/xprint.xml
+++ b/src/xprint.xml
@@ -27,7 +27,7 @@ authorization from the authors.
 -->
 
 <xcb header="xprint" extension-xname="XpExtension" extension-name="XPrint"
-    major-version="1" minor-version="0">
+    extension-multiword="true" major-version="1" minor-version="0">
 
     <!-- Conforms to XPRINT 1.0 -->
 

diff --git a/src/xvmc.xml b/src/xvmc.xml
index 40dce26..ecfafea 100644 (file)
--- a/src/xvmc.xml
+++ b/src/xvmc.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC" extension-oneword="true" major-version="1" minor-version="1">
+<xcb header="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC" major-version="1" minor-version="1">
     <import>xv</import>
 
     <xidtype name="CONTEXT" />