Merge branch 'backport' into work
Dana Jansens danakj@orodu.net
2 files changed,
2 insertions(+),
2 deletions(-)
M
data/autostart.sh.in
→
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
M
data/xsession/openbox-gnome-session.in
→
data/xsession/openbox-gnome-session.in
@@ -37,7 +37,7 @@ # make sure openbox is going to be run
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