summaryrefslogtreecommitdiff
path: root/data/menu.xml
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2009-12-11 19:02:11 -0500
committerDana Jansens <danakj@orodu.net>2009-12-11 19:02:11 -0500
commitacafa38c8ea210b12ed92fc16281b915ab61542c (patch)
treece4c7d2a4a9b3478a4d48af2c54ada06593ed022 /data/menu.xml
parent2f09e0ce388f63c341cb328d795766e2bd0dc24b (diff)
parent9ba2b04e96449fea5b6bd212aa3d431638754bdd (diff)
Merge branch 'backport' into work
Conflicts: openbox/config.c openbox/event.c openbox/prop.c openbox/prop.h openbox/screen.c openbox/screen.h
Diffstat (limited to 'data/menu.xml')
-rw-r--r--data/menu.xml7
1 files changed, 1 insertions, 6 deletions
diff --git a/data/menu.xml b/data/menu.xml
index 61fba664..39da04d6 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -369,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">
@@ -390,7 +385,7 @@
<menu id="system-menu"/>
<separator />
<item label="Log Out">
- <action name="SessionLogout">
+ <action name="Exit">
<prompt>yes</prompt>
</action>
</item>