diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-14 16:19:57 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-14 16:19:57 -0500 |
| commit | 3bd4397b6ec5212bfe53a36892746962dc45dbeb (patch) | |
| tree | 0aa06742564779de5995e9145368da1275cee3bd /data/xsession | |
| parent | 937b529893cb93859245ad2f0e46d31bfd2f8097 (diff) | |
| parent | 374888f5e9c3c98204a708ef40afec86d136d836 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/frame.c
Diffstat (limited to 'data/xsession')
| -rw-r--r-- | data/xsession/openbox-gnome-session.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in index 6765ae82..1f17edbc 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 test -z $(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 |