updates and fixes for the xml/xsd shit

diff --git a/data/menu.xml.in b/data/menu.xml.in
index 3dbff30ab2b1f94a208692640e50d580f926c625..8892f316305cdca5f6403b0123426dd0590acfab 100644 (file)
--- a/data/menu.xml.in
+++ b/data/menu.xml.in
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<openbox_menu xmlns="http://openbox/.org"
+<openbox_menu xmlns="http://openbox.org/"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="
-                http://openbox.org/schema.php?type=menu&amp;version=@version@
-                file://@xsddir@/rc.xsd">
+        xsi:schemaLocation="http://openbox.org/
+                file://@xsddir@/menu.xsd">
 
 <menu id="games-menu" label="Games">
   <item label="Crack-Attack">

diff --git a/data/menu.xsd b/data/menu.xsd
index 2837a1b7f51bbcfb04ce8e3139bdab0da105fa6f..0342687dc8a28714c4ac1f71d248eb576079dc93 100644 (file)
--- a/data/menu.xsd
+++ b/data/menu.xsd
@@ -38,6 +38,7 @@
             <xs:element maxOccurs="unbounded" minOccurs="0" name="separator" type="ob:empty"/>
         </xs:choice>
         <xs:attribute name="label" type="xs:string" use="optional"/>
+        <xs:attribute name="execute" type="xs:string" use="optional"/>
         <xs:attribute name="id" type="xs:string" use="required"/>
     </xs:complexType>
     <xs:complexType name="empty">
@@ -50,7 +51,7 @@
             <xs:element minOccurs="0" name="action">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="Execute" type="xs:string"/>
+                        <xs:element minOccurs="0" name="execute" type="xs:string"/>
                     </xs:sequence>
                     <xs:attribute name="name" type="ob:actionname" use="required"/>
                 </xs:complexType>

diff --git a/data/rc.xml.in b/data/rc.xml.in
index c516f763ca259a79fad01bf93c0bc6c03deca7bc..df2c482326064e013c8ee0d4bdc58d6ab76d1255 100644 (file)
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -3,10 +3,9 @@
 <!-- Do not edit this file, it will be overwritten on install.
         Copy the file to $HOME/.config/openbox/ instead. -->
 
-<openbox_config xmlns="http://openbox/.org"
+<openbox_config xmlns="http://openbox.org/"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="
-                http://openbox.org/schema.php?type=rc&amp;version=@version@
+        xsi:schemaLocation="http://openbox.org/
                 file://@xsddir@/rc.xsd">
 
 <resistance>
@@ -16,8 +15,8 @@
 
 <focus>
   <focusNew>yes</focusNew>
-  <followMouse>no</followMouse>
   <focusLast>yes</focusLast>
+  <followMouse>no</followMouse>
   <focusDelay>0</focusDelay>
   <raiseOnFocus>no</raiseOnFocus>
 </focus>

diff --git a/data/rc.xsd b/data/rc.xsd
index 9124c924d983d84278a13613fb4b7a3e417ce90a..9ddc67b71d67b84ed638b1674d91493d7156b3c6 100644 (file)
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -213,6 +213,7 @@
             <xs:enumeration value="Iconify"/>
             <xs:enumeration value="Icon"/>
             <xs:enumeration value="Close"/>
+            <xs:enumeration value="MoveResize"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="button">