1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
|
Description: Drop check gnome version and depends on gconf2.
Author: Mateusz Ĺukasik <mati75@linuxmint.pl>
Bug-Debian: https://bugs.debian.org/886050
Bug-Ubuntu: https://launchpad.net/bugs/1740420
Last-Update: 2018-01-04
--- a/data/xsession/openbox-gnome-session.in
+++ b/data/xsession/openbox-gnome-session.in
@@ -12,55 +12,7 @@ xprop -root -remove _NET_NUMBER_OF_DESKT
-remove _NET_DESKTOP_NAMES \
-remove _NET_CURRENT_DESKTOP 2> /dev/null
-VER=$(gnome-session --version 2>/dev/null | \
- sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
-
-MAJOR=$(echo $VER | cut -d . -f 1)
-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
- # older gnome-session was easy to work with
- export WINDOW_MANAGER="@bindir@/openbox"
- exec gnome-session --choose-session=openbox-session "$@"
-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
-
- # get the current default session
- SESSION=$(gconftool-2 -g $SPATH/default_session 2> /dev/null)
-
- # 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
- # if openbox isn't in the session then append it
- SESSION="${SESSION%]},openbox]"
- fi
-
- # get the current GNOME/Openbox session
- OB_SESSION=$(gconftool-2 -g $SPATH/openbox_session 2> /dev/null)
-
- # update the GNOME/Openbox session if needed
- 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
- fi
-
- # 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
-
|