Remove desktop hints since Openbox won't overwrite them, but they may be set from...

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

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index e76d3203f8f74da81272ac61f2cebb6aa98ae201..fa1bb99693a96654945825845488681b12d1f31e 100644 (file)
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -1,10 +1,26 @@
 #!/bin/sh
 
-AUTOSTART="$HOME/.config/openbox/autostart"
+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 -r $GLOBALAUTOSTART; then
+        . $GLOBALAUTOSTART
+    fi
 fi
 
 exec @bindir@/openbox "$@"