Address a couple bugs in rc.xsd (Fix bug 5746)

diff --git a/data/rc.xsd b/data/rc.xsd
index ad96994..e285033 100644 (file)
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -72,7 +72,7 @@
             <xsd:element minOccurs="0" name="policy" type="ob:placementpolicy"/>
             <xsd:element minOccurs="0" name="center" type="ob:bool"/>
             <xsd:element minOccurs="0" name="monitor" type="ob:placementmonitor"/>
             <xsd:element minOccurs="0" name="policy" type="ob:placementpolicy"/>
             <xsd:element minOccurs="0" name="center" type="ob:bool"/>
             <xsd:element minOccurs="0" name="monitor" type="ob:placementmonitor"/>

-            <xsd:element minOccurs="0" name="monitor" type="ob:primarymonitor"/>
+            <xsd:element minOccurs="0" name="primaryMonitor" type="ob:primarymonitor"/>

         </xsd:sequence>
     </xsd:complexType>
     <xsd:complexType name="margins">
         </xsd:sequence>
     </xsd:complexType>
     <xsd:complexType name="margins">


@@ -525,7 +525,7 @@
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Mouse"/>
             <xsd:enumeration value="Active"/>
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Mouse"/>
             <xsd:enumeration value="Active"/>

-            <xsd:enumeration value="[0-9][0-9][0-9][0-9][0-9]"/>
+            <xsd:pattern value="[0-9][0-9][0-9][0-9][0-9]"/>

         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="popupposition">
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="popupposition">