nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'backport' into work

Browse source
This commit is contained in:
Dana Jansens 2010-02-05 13:47:58 -05:00
commit 31f0c8c1ad
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/autostart.sh.in
View file

@ -38,7 +38,7 @@ fi
# Run XDG autostart things. By default don't run anything desktop-specific # Run XDG autostart things. By default don't run anything desktop-specific
# See xdg-autostart --help more info # See xdg-autostart --help more info
DESKTOP_ENV="" DESKTOP_ENV="OPENBOX"
if which @secretbindir@/xdg-autostart >/dev/null; then if which @secretbindir@/xdg-autostart >/dev/null; then
@secretbindir@/xdg-autostart $DESKTOP_ENV @secretbindir@/xdg-autostart $DESKTOP_ENV
fi fi

2
data/xsession/openbox-gnome-session.in
View file

@ -37,7 +37,7 @@ else
if test -z "$SESSION"; then if test -z "$SESSION"; then
# if its empty then just run openbox # if its empty then just run openbox
SESSION="[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 # if openbox isn't in the session then append it
SESSION="${SESSION%]},openbox]" SESSION="${SESSION%]},openbox]"
fi fi