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

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index 259dc580..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="${XDG_CONFIG_HOME:-"$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" "$@"