Merge branch 'backport' into work

[chaz/openbox] / data / xsession / openbox-kde-session.in

diff --git a/data/xsession/openbox-kde-session.in b/data/xsession/openbox-kde-session.in
index a125e4cd06707fab0dc82d75b7a520424f7d9cad..14e350430a8009870f2a408c9aab258d530c3620 100644 (file)
--- a/data/xsession/openbox-kde-session.in
+++ b/data/xsession/openbox-kde-session.in
@@ -1,6 +1,20 @@
 #!/bin/sh
 
+if test -n "$1"; then
+    echo "Syntax: openbox-kde-session"
+    echo
+    echo "See the openbox-kde-session(1) manpage for help."
+  exit
+fi
+
+# Set the prefix for the menu layout to use
+export XDG_MENU_PREFIX="kde-"
+
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS \
+      -remove _NET_DESKTOP_NAMES \
+      -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
 # Run KDE with Openbox as its window manager
 export KDEWM="@bindir@/openbox"
-export OPENBOX_CONFIG_NAMESPACE="kde"
 exec startkde "$@"