diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-02-05 13:47:58 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-02-05 13:47:58 -0500 |
| commit | 31f0c8c1ad8c9acf369ab8336765f4bf673b8e21 (patch) | |
| tree | ed017ab085846307aac1fb958cf5e7b5509b4034 /data | |
| parent | 02a956b065a157212d98c149ac3f5db2ea64a0cb (diff) | |
| parent | 2ab63cb36f01de0edca91921e6608f67dd31c6f3 (diff) | |
Merge branch 'backport' into work
Diffstat (limited to 'data')
| -rw-r--r-- | data/autostart.sh.in | 2 | ||||
| -rw-r--r-- | data/xsession/openbox-gnome-session.in | 2 |
2 files changed, 2 insertions, 2 deletions
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 |