diff options
| author | Geoffrey Antos <dynamotwain@aim.com> | 2011-10-07 09:29:30 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2011-10-07 09:38:25 -0400 |
| commit | 3f870080de978e905f764b6cbc8e662a419d8983 (patch) | |
| tree | 95c12949e1e6f2abdcc654d3f170d468ccecba24 /data/xsession/openbox-gnome-session.in | |
| parent | 303cbe76dc2dc273cd7e68a5eaf96c2af3b5d7ab (diff) | |
Make openbox-gnome-session compatible with gnome3 with gnome-session 3.0+ support.
Yay they did something nice and made it easier for other window managers to be used. How unexpected and pleasant.
Diffstat (limited to 'data/xsession/openbox-gnome-session.in')
| -rw-r--r-- | data/xsession/openbox-gnome-session.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in index 8dd799c0..f31c9ad2 100644 --- a/data/xsession/openbox-gnome-session.in +++ b/data/xsession/openbox-gnome-session.in @@ -21,11 +21,11 @@ MINOR=$(echo $VER | cut -d . -f 2) # run GNOME with Openbox as its window manager if test $MAJOR -lt 2 || (test $MAJOR = 2 && test $MINOR -le 22); then - # old gnome-session was easy to work with + # older gnome-session was easy to work with export WINDOW_MANAGER="@bindir@/openbox" exec gnome-session --choose-session=openbox-session "$@" -else - # new gnome-session requires openbox to be set in gconf and an +elif test $MAJOR -lt 3; then + # old gnome-session requires openbox to be set in gconf and an # openbox.desktop to be installed in the applications directory SPATH=/desktop/gnome/session @@ -54,6 +54,12 @@ else # run GNOME/Openbox exec gnome-session --default-session-key $SPATH/openbox_session "$@" +else + # new gnome-session requires session file installed in + # /usr/share/gnome-session/sessions as well as openbox.desktop to be + # installed in the applications directory + + exec gnome-session --session=openbox-gnome fi |