Merge branch 'backport' into work

diff --git a/data/autostart.sh.in b/data/autostart.sh.in
index 62a30e1c5e8ccbbb412e785cf11d57d5226137f3..eb55558a7f9fff001da49fa27b591ecf210d7d05 100644 (file)
--- a/data/autostart.sh.in
+++ b/data/autostart.sh.in
@@ -38,7 +38,7 @@ fi
 
 # Run XDG autostart things.  By default don't run anything desktop-specific
 # See xdg-autostart --help more info
-DESKTOP_ENV=""
+DESKTOP_ENV="OPENBOX"
 if which @secretbindir@/xdg-autostart >/dev/null; then
   @secretbindir@/xdg-autostart $DESKTOP_ENV
 fi

diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
index 1f17edbcd086bf5d164d506e5e3deab98262d621..8dd799c0dd0775abd3f3c3c1daa5ca32368eb647 100644 (file)
--- a/data/xsession/openbox-gnome-session.in
+++ b/data/xsession/openbox-gnome-session.in
@@ -37,7 +37,7 @@ else
   if test -z "$SESSION"; then
       # if its empty then just run openbox
       SESSION="[openbox]"
-  elif echo "$SESSION" | grep -q openbox; then
+  elif ! echo "$SESSION" | grep -q openbox; then
       # if openbox isn't in the session then append it
       SESSION="${SESSION%]},openbox]"
   fi