Merge branch 'backport' into work

[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 c2bc9399401b831ed6aa467991fbd000ec7cb982..278ac6a8ed5a42aa55d1caaa3aef5ab913d40a84 100644 (file)
--- a/data/xsession/openbox-gnome-session.in
+++ b/data/xsession/openbox-gnome-session.in
@@ -1,5 +1,12 @@
 #!/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
+
 # Run GNOME with Openbox as its window manager
 export WINDOW_MANAGER="@bindir@/openbox"
-exec gnome-session "$@"
+exec gnome-session --choose-session=openbox-session "$@"