Merge branch 'backport' into work

[chaz/openbox] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index 3f070737447c9fae2259645dbf0d655becbb591f..557721af96034a921feaffd9163bbb21a0d6bfdc 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -1,33 +1,31 @@
 <?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/">
+<openbox_menu xmlns="http://openbox.org/3.4/menu">
 
 <menu id="games-menu" label="Games">
   <item label="Crack-Attack">
-    <action name="Execute"><execute>crack-attack</execute></action>
+    <action name="Execute"><command>crack-attack</command></action>
   </item>
   <item label="XFRisk">
-    <action name="Execute"><execute>xfrisk</execute></action>
+    <action name="Execute"><command>xfrisk</command></action>
   </item>
   <item label="Quake III">
-    <action name="Execute"><execute>quake3</execute></action>
+    <action name="Execute"><command>quake3</command></action>
   </item>
 </menu>
 
 <menu id="apps-menu" label="Applications">
   <item label="Xterm">
-    <action name="Execute"><execute>xterm</execute></action>
+    <action name="Execute"><command>xterm</command></action>
   </item>
   <item label="Mozilla">
-    <action name="Execute"><execute>mozilla</execute></action>
+    <action name="Execute"><command>mozilla</command></action>
   </item>
   <item label="Gaim">
-    <action name="Execute"><execute>gaim</execute></action>
+    <action name="Execute"><command>gaim</command></action>
   </item>
   <item label="Quark">
-    <action name="Execute"><execute>strange-quark</execute></action>
+    <action name="Execute"><command>strange-quark</command></action>
   </item>
 </menu>
 
@@ -39,7 +37,10 @@
   <menu id="client-list-menu" />
   <separator />
   <item label="ObConf">
-    <action name="Execute"><execute>obconf</execute></action>
+    <action name="Execute">
+      <startupnotify><enabled>yes</enabled><icon>openbox</icon></startupnotify>
+      <command>obconf</command>
+    </action>
   </item>
   <item label="Reconfigure">
     <action name="Reconfigure" />