Make openbox-gnome-session work with gnome-session > 2.22

[chaz/openbox] / data / xsession / openbox-gnome-session.in

diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
index b52235528634301eb3f59ce51d2443eb880b80c7..d93bab0cca67f22d9e360d33bbf972bcb983b3ff 100644 (file)
--- a/data/xsession/openbox-gnome-session.in
+++ b/data/xsession/openbox-gnome-session.in
@@ -1,6 +1,33 @@
 #!/bin/sh
 
+if test -n "$1"; then
+    echo "Syntax: openbox-gnome-session"
+    echo
+    echo "See the openbox-gnome-session(1) manpage for help."
+  exit
+fi
+
+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
 export WINDOW_MANAGER="@bindir@/openbox"
-export OPENBOX_CONFIG_NAMESPACE="gnome"
-exec gnome-session "$@"
+
+if test $MAJOR -lt 2 || (test $MAJOR = 2 && test $MINOR -le 22); then
+  # old gnome-session allows multiple sessions to be saved
+  exec gnome-session --choose-session=openbox-session "$@"
+else
+  # make sure the gnome-wm script is being used
+  gconftool-2 -t string \
+      -s /desktop/gnome/session/required_components/windowmanager "gnome-wm" \
+      2> /dev/null
+
+  # new gnome-session does not allow multiple sessions
+  exec gnome-session "$@"
+fi
+
+
+