X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=data%2Fxsession%2Fopenbox-session.in;h=fa1bb99693a96654945825845488681b12d1f31e;hb=a891a188d0edc740cc1ba19025df1844c6a83f76;hp=c466f17de26f908b975dab24a968d6ea88ca5f57;hpb=b74cff0302e70d702e958a8205a6f6e2e2858192;p=chaz%2Fopenbox

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index c466f17d..fa1bb996 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -1,15 +1,25 @@
 #!/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
-    # sleep for 1 second so Openbox is there before anything else
-    (sleep 1 && . $AUTOSTART) &
+if test -r $AUTOSTART; then
+    . $AUTOSTART
 else
-    if test -e $GLOBALAUTOSTART; then
-        # sleep for 1 second so Openbox is there before anything else
-        (sleep 1 && . $GLOBALAUTOSTART) &
+    if test -r $GLOBALAUTOSTART; then
+        . $GLOBALAUTOSTART
     fi
 fi