From: Dana Jansens <danakj@orodu.net>
Date: Fri, 5 Feb 2010 18:47:58 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=31f0c8c1ad8c9acf369ab8336765f4bf673b8e21;hp=02a956b065a157212d98c149ac3f5db2ea64a0cb

Merge branch 'backport' into work
---

diff --git a/data/autostart.sh.in b/data/autostart.sh.in
index 62a30e1c..eb55558a 100644
--- 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 1f17edbc..8dd799c0 100644
--- 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