diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-08 10:22:30 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-08 10:22:30 -0500 |
| commit | 73575c10ce3ede1637e4f959b56e1f7d5f110b91 (patch) | |
| tree | 9af1e7061d53dcc62be4000fc206cfcaa71cc4a8 /data/xsession | |
| parent | 4f414ed0f124fa67b61d347899aa3b30aa0294f1 (diff) | |
| parent | f163c46eaf01ced8405fa36a3bf4a5c488f0f5aa (diff) | |
Merge branch 'backport' into work
Conflicts:
Makefile.am
openbox/actions/focus.c
openbox/config.c
openbox/event.c
openbox/menuframe.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 de46bec5..6765ae82 100644 --- a/data/xsession/openbox-gnome-session.in +++ b/data/xsession/openbox-gnome-session.in @@ -46,7 +46,7 @@ else OB_SESSION=$(gconftool-2 -g $SPATH/openbox_session 2> /dev/null) # update the GNOME/Openbox session if needed - if x$OB_SESSION != x$SESSION; then + if test x$OB_SESSION != x$SESSION; then # the default session changed or we didn't run GNOME/Openbox before gconftool-2 -t list --list-type=strings -s $SPATH/openbox_session \ "$SESSION" 2> /dev/null |