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

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index c466f17d..3cf3571f 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -1,16 +1,22 @@
 #!/bin/sh
 
-AUTOSTART="$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) &
-else
-    if test -e $GLOBALAUTOSTART; then
-        # sleep for 1 second so Openbox is there before anything else
-        (sleep 1 && . $GLOBALAUTOSTART) &
-    fi
+if test -n "$1"; then
+    echo "Syntax: openbox-session"
+    echo
+    echo "See the openbox-session(1) manpage for help."
+  exit
 fi
 
-exec @bindir@/openbox "$@"
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS \
+      -remove _NET_DESKTOP_NAMES \
+      -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
+# Set up the environment
+A="@configdir@/openbox/environment"
+test -r $A && . $A
+A="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/environment"
+test -r $A && . $A
+
+# Run Openbox, and have it run the autostart stuff
+exec @bindir@/openbox --startup "@libexecdir@/openbox-autostart OPENBOX" "$@"