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

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index cc2169f4..3cf3571f 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -7,15 +7,16 @@ if test -n "$1"; then
   exit
 fi
 
-AUTOSTART="$HOME/.config/openbox/autostart.sh"
-GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS \
+      -remove _NET_DESKTOP_NAMES \
+      -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
-if test -e $AUTOSTART; then
-    . $AUTOSTART
-else
-    if test -e $GLOBALAUTOSTART; then
-        . $GLOBALAUTOSTART
-    fi
-fi
+# Set up the environment
+A="@configdir@/openbox/environment"
+test -r $A && . $A
+A="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/environment"
+test -r $A && . $A
 
-exec @bindir@/openbox "$@"
+# Run Openbox, and have it run the autostart stuff
+exec @bindir@/openbox --startup "@libexecdir@/openbox-autostart OPENBOX" "$@"