|
Kristian Høgsberg |
2298d83 |
diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome-session-2.19.6/data/gnome-session.schemas.in
|
|
Kristian Høgsberg |
2298d83 |
--- gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager 2007-07-30 16:07:16.000000000 -0400
|
|
Kristian Høgsberg |
0b8f849 |
+++ gnome-session-2.19.6/data/gnome-session.schemas.in 2007-08-09 17:47:42.000000000 -0400
|
|
 |
382ec2b |
@@ -2,11 +2,22 @@
|
|
|
382ec2b |
<gconfschemafile>
|
|
|
382ec2b |
<schemalist>
|
|
|
382ec2b |
<schema>
|
|
|
382ec2b |
+ <key>/schemas/apps/gnome-session/rh/window_manager</key>
|
|
|
382ec2b |
+ <applyto>/apps/gnome-session/rh/window_manager</applyto>
|
|
|
382ec2b |
+ <owner>gnome</owner>
|
|
|
382ec2b |
+ <type>string</type>
|
|
|
382ec2b |
+ <default>metacity</default>
|
|
|
382ec2b |
+ <locale name="C">
|
|
|
382ec2b |
+ <short>Window Manager to start</short>
|
|
|
382ec2b |
+ <long>The Window manager that gnome-session will start. Valid values are "metacity" and "compiz".</long>
|
|
|
382ec2b |
+ </locale>
|
|
|
382ec2b |
+ </schema>
|
|
|
382ec2b |
+ <schema>
|
|
|
382ec2b |
<key>/schemas/apps/gnome-session/options/show_splash_screen</key>
|
|
|
382ec2b |
<applyto>/apps/gnome-session/options/show_splash_screen</applyto>
|
|
|
382ec2b |
<owner>gnome</owner>
|
|
|
382ec2b |
<type>bool</type>
|
|
|
382ec2b |
- <default>true</default>
|
|
|
382ec2b |
+ <default>false</default>
|
|
|
382ec2b |
<locale name="C">
|
|
|
382ec2b |
<short>Show the splash screen</short>
|
|
|
382ec2b |
<long>Show the splash screen when the session starts up</long>
|
|
 |
f67b588 |
diff -up gnome-session-2.19.6/data/gnome-wm.window-manager gnome-session-2.19.6/data/gnome-wm
|
|
|
f67b588 |
--- gnome-session-2.19.6/data/gnome-wm.window-manager 2007-07-30 16:07:15.000000000 -0400
|
|
|
f67b588 |
+++ gnome-session-2.19.6/data/gnome-wm 2007-08-10 15:01:04.000000000 -0400
|
|
|
382ec2b |
@@ -3,7 +3,9 @@
|
|
|
382ec2b |
# The user can specify his prefered WM by setting the WINDOW_MANAGER
|
|
|
382ec2b |
# environment variable.
|
|
|
382ec2b |
#
|
|
|
382ec2b |
-# If this is not set, we search a list of known windowmanagers and use
|
|
|
382ec2b |
+# If this is not set, we check the /apps/gnome-session/rh/window_manager key
|
|
|
382ec2b |
+# and go off that. finally, if all else fails we search a list of known
|
|
|
382ec2b |
+# windowmanagers and use
|
|
|
382ec2b |
# the first one that is found in the users's PATH
|
|
|
382ec2b |
#
|
|
|
382ec2b |
|
|
Kristian Høgsberg |
2298d83 |
@@ -38,6 +40,9 @@ for n in "$@" ; do
|
|
|
382ec2b |
done
|
|
|
382ec2b |
|
|
|
382ec2b |
# WINDOW_MANAGER overrides all
|
|
|
382ec2b |
+if [ -z "$WINDOW_MANAGER" ] ; then
|
|
|
382ec2b |
+ WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/rh/window_manager)
|
|
|
382ec2b |
+fi
|
|
|
382ec2b |
|
|
|
382ec2b |
if [ -z "$WINDOW_MANAGER" ] ; then
|
|
|
382ec2b |
# Create a list of window manager we can handle, trying to only use the
|