rpms/gnome-session/FC-6 gnome-session-2.16.3-window-manager.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 gnome-session.spec, 1.91, 1.92 sources, 1.28, 1.29

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-session/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11791

Modified Files:
	.cvsignore gnome-session.spec sources 
Added Files:
	gnome-session-2.16.3-window-manager.patch 
Log Message:
fix a patch


gnome-session-2.16.3-window-manager.patch:
 gnome-session.schemas.in |   13 ++++++++++++-
 gnome-wm                 |    8 +++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE gnome-session-2.16.3-window-manager.patch ---
--- gnome-session-2.16.3/gnome-session/gnome-session.schemas.in.window-manager	2007-01-29 17:11:38.000000000 -0500
+++ gnome-session-2.16.3/gnome-session/gnome-session.schemas.in	2007-01-31 14:51:41.000000000 -0500
@@ -2,11 +2,22 @@
 <gconfschemafile>
    <schemalist>
       <schema>
+         <key>/schemas/apps/gnome-session/rh/window_manager</key>
+         <applyto>/apps/gnome-session/rh/window_manager</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+         <default>metacity</default>
+         <locale name="C">
+	    <short>Window Manager to start</short>
+	    <long>The Window manager that gnome-session will start. Valid values are "metacity" and "compiz".</long>
+         </locale>
+      </schema>
+      <schema>
          <key>/schemas/apps/gnome-session/options/show_splash_screen</key>
          <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
          <owner>gnome</owner>
          <type>bool</type>
-         <default>true</default>
+         <default>false</default>
          <locale name="C">
             <short>Show the splash screen</short>
             <long>Show the splash screen when the session starts up</long>
--- gnome-session-2.16.3/gnome-session/gnome-wm.window-manager	2007-01-29 17:11:38.000000000 -0500
+++ gnome-session-2.16.3/gnome-session/gnome-wm	2007-01-31 14:53:51.000000000 -0500
@@ -3,7 +3,9 @@
 # The user can specify his prefered WM by setting the WINDOW_MANAGER
 # environment variable.
 #
-# If this is not set, we search a list of known windowmanagers and use
+# If this is not set, we check the /apps/gnome-session/rh/window_manager key
+# and go off that.  finally, if all else fails we search a list of known 
+# windowmanagers and use
 # the first one that is found in the users's PATH
 #
 
@@ -40,6 +42,10 @@
 # WINDOW_MANAGER overrides all
 
 if [ -z "$WINDOW_MANAGER" ] ; then
+      WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/rh/window_manager)
+fi
+
+if [ -z "$WINDOW_MANAGER" ] ; then
   # Create a list of window manager we can handle, trying to only use the
   # compositing ones when it makes sense
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-6/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	5 Sep 2006 00:25:40 -0000	1.28
+++ .cvsignore	31 Jan 2007 19:45:45 -0000	1.29
@@ -1 +1 @@
-gnome-session-2.16.0.tar.bz2
+gnome-session-2.16.3.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-6/gnome-session.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnome-session.spec	27 Nov 2006 05:25:38 -0000	1.91
+++ gnome-session.spec	31 Jan 2007 19:45:45 -0000	1.92
@@ -13,8 +13,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.16.0
-Release: 7%{?dist}
+Version: 2.16.3
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -57,7 +57,7 @@
 Patch12: gnome-session-2.15.91-desensitize-invalid-buttons.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=350848
-Patch13: gnome-session-2.15.91-window-manager.patch
+Patch13: gnome-session-2.16.3-window-manager.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=84315
 Patch14: gnome-session-2.15.91-http-proxy.patch
@@ -195,6 +195,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Wed Jan 31 2007 Matthias Clasen <mclasen redhat com> - 2.16.3-1
+- Update to 2.16.3
+
 * Mon Nov 27 2006 Ray Strode <rstrode redhat com> - 2.16.1-7.fc6
 - don't set http_proxy variable if proxy requires password
   (bug 217332)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-6/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	5 Sep 2006 00:25:40 -0000	1.28
+++ sources	31 Jan 2007 19:45:45 -0000	1.29
@@ -1 +1 @@
-0a79eac14f4e13b1935e02eeec7745c1  gnome-session-2.16.0.tar.bz2
+d35a7f541adecc112b7c73f95353a183  gnome-session-2.16.3.tar.bz2