Merge branch 'master' into chaz

[chaz/openbox] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index b7c0d64fa68840f0cc43e763000ec8e2157f6b6a..39da04d617a2eeac4af6df63b1a0c875b3f4cc49 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -350,6 +350,12 @@
       <startupnotify><enabled>yes</enabled></startupnotify>
     </action>
   </item>
+  <item label="Xfce Settings">
+    <action name="Execute">
+      <command>xfce-setting-show</command>
+      <startupnotify><enabled>yes</enabled></startupnotify>
+    </action>
+  </item>
   <item label="Manage Cups Printers">
     <action name="Execute">
       <command>xdg-open http://localhost:631/</command>
@@ -363,11 +369,6 @@
   <item label="Reconfigure Openbox">
     <action name="Reconfigure" />
   </item>
-  <item label="Exit Openbox">
-    <action name="Exit">
-      <prompt>yes</prompt>
-    </action>
-  </item>
 </menu>
 
 <menu id="root-menu" label="Openbox 3">
@@ -383,8 +384,8 @@
   <separator label="System" />
   <menu id="system-menu"/>
   <separator />
-  <item label="Logout">
-    <action name="SessionLogout">
+  <item label="Log Out">
+    <action name="Exit">
       <prompt>yes</prompt>
     </action>
   </item>