X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=data%2Fxsession%2Fopenbox-session.in;h=fa1bb99693a96654945825845488681b12d1f31e;hb=14f8b4cb544bf50d059b0feb85585e19b77752c7;hp=b3f1c0574b8742883b0ce6d1b28714df69538390;hpb=b11d260dbed6faa93eb6c0393e0b284231e4055e;p=chaz%2Fopenbox

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index b3f1c057..fa1bb996 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -1,12 +1,24 @@
 #!/bin/sh
 
-AUTOSTART="$HOME/.config/openbox/autostart.sh"
+if test -n "$1"; then
+    echo "Syntax: openbox-session"
+    echo
+    echo "See the openbox-session(1) manpage for help."
+  exit
+fi
+
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS \
+      -remove _NET_DESKTOP_NAMES \
+      -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
+AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
 GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
 
-if test -e $AUTOSTART; then
+if test -r $AUTOSTART; then
     . $AUTOSTART
 else
-    if test -e $GLOBALAUTOSTART; then
+    if test -r $GLOBALAUTOSTART; then
         . $GLOBALAUTOSTART
     fi
 fi