rpms/gnome-session
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- update patch from 2.15.4-3 to be more session friendly (bug 201473)

Browse Source
This commit is contained in:
Ray Strode 2006-08-11 00:15:58 +00:00
parent 80f04d8c5b
commit bf0fa15ff7
2 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gnome-session-2.15.90-window-manager.patch Normal file
View File

@ -0,0 +1,50 @@
--- gnome-session-2.15.90/gnome-session/gnome-session.schemas.in.window-manager 2005-04-26 06:56:50.000000000 -0400
+++ gnome-session-2.15.90/gnome-session/gnome-session.schemas.in 2006-08-10 19:09:05.000000000 -0400
@@ -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.15.90/gnome-session/gnome-wm.window-manager 2006-08-10 19:09:44.000000000 -0400
+++ gnome-session-2.15.90/gnome-session/gnome-wm 2006-08-10 19:18:04.000000000 -0400
@@ -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
#
@@ -39,6 +41,10 @@
# WINDOW_MANAGER overrides all
+if [ -z "$WINDOW_MANAGER" ] ; then
+ WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/rh/window_manager)
+fi
+
OLDIFS=$IFS
IFS=":"
if [ -z "$WINDOW_MANAGER" ] ; then

13
gnome-session.spec
View File

@ -14,7 +14,7 @@
Summary: GNOME session manager
Name: gnome-session
Version: 2.15.90
Release: 1%{?dist}
Release: 2%{?dist}
URL: http://www.gnome.org
Source0: %{name}-%{version}.tar.bz2
Source1: redhat-default-session
@ -49,7 +49,7 @@ Patch8: gnome-session-2.12.0-shaped.patch
# too much crashing
Patch9: gnome-session-2.13.4-no-crashes.patch
Patch12: gnome-session-2.13.92-desensitize-invalid-buttons.patch
Patch13: gnome-session-2.15.4-window-manager.patch
Patch13: gnome-session-2.15.90-window-manager.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: pango-devel >= %{pango_version}
@ -89,7 +89,7 @@ GNOME components and handles logout and saving the session.
%patch8 -p1 -b .shaped
%patch9 -p1 -b .no-crashes
%patch12 -p1 -b .desensitize-invalid-buttons
%patch13 -p0 -b .window-manager
%patch13 -p1 -b .window-manager
%build
@ -167,10 +167,13 @@ done
%{_datadir}/gnome/autostart
%changelog
* Thu Aug 4 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.90-1.fc6
* Thu Aug 10 2006 Ray Strode <rstrode@redhat.com> - 2.15.90-2.fc6
- update patch from 2.15.4-3 to be more session friendly (bug 201473)
* Fri Aug 4 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.90-1.fc6
- Update to 2.15.90
* Thu Aug 3 2006 Soren Sandmann <sandmann@redhat.com> - 2.15.4-3
* Thu Aug 3 2006 Soren Sandmann <sandmann@redhat.com> - 2.15.4-3
- Add patch to (a) add configuration option for window manager, (b) start the window
manager, and (c) disable splash screen by default.