relocate the xsd's so they don't clash, and point to the right places

[chaz/openbox] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index 9a9f82ff5953494233a97b8fbb80a03851f14da3..50cabea9e96411202d5084f2935072d13a020a6d 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -1,46 +1,52 @@
-<openbox_menu>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<openbox_menu xmlns="http://openbox.org/"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://openbox.org/4.0/menu">
 
 <menu id="games-menu" label="Games">
   <item label="Crack-Attack">
-    <action name="execute"><execute>crack-attack</execute></action>
+    <action name="Execute"><execute>crack-attack</execute></action>
   </item>
   <item label="XFRisk">
-    <action name="execute"><execute>xfrisk</execute></action>
+    <action name="Execute"><execute>xfrisk</execute></action>
   </item>
   <item label="Quake III">
-    <action name="execute"><execute>quake3</execute></action>
+    <action name="Execute"><execute>quake3</execute></action>
   </item>
 </menu>
 
 <menu id="apps-menu" label="Applications">
   <item label="Xterm">
-    <action name="execute"><execute>xterm</execute></action>
+    <action name="Execute"><execute>xterm</execute></action>
   </item>
   <item label="Mozilla">
-    <action name="execute"><execute>mozilla</execute></action>
+    <action name="Execute"><execute>mozilla</execute></action>
   </item>
   <item label="Gaim">
-    <action name="execute"><execute>gaim</execute></action>
+    <action name="Execute"><execute>gaim</execute></action>
   </item>
   <item label="Quark">
-    <action name="execute"><execute>strange-quark</execute></action>
+    <action name="Execute"><execute>strange-quark</execute></action>
   </item>
 </menu>
 
 <menu id="root-menu" label="Openbox 3">
+  <separator label="Openbox" />
   <menu id="apps-menu" />
   <menu id="games-menu" />
   <separator />
   <menu id="client-list-menu" />
   <separator />
-  <item label="Reconfigure">
-    <action name="reconfigure" />
+  <item label="ObConf">
+    <action name="Execute"><execute>obconf</execute></action>
   </item>
-  <item label="Restart">
-    <action name="restart" />
+  <item label="Reconfigure">
+    <action name="Reconfigure" />
   </item>
+  <separator />
   <item label="Exit">
-    <action name="exit" />
+    <action name="Exit" />
   </item>
 </menu>