- Edit the right window manager patch and delete the old one.
This commit is contained in:
Kristian Høgsberg
parent
4d75300486
commit
2298d83358
@ -1,78 +0,0 @@
|
||||
--- 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:19:11.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 2005-07-19 08:44:48.000000000 -0400
|
||||
+++ gnome-session-2.15.90/gnome-session/gnome-wm 2006-08-11 16:04:59.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 @@ done
|
||||
|
||||
# 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
|
||||
@@ -67,11 +73,19 @@ fi
|
||||
# Now create options OPT1 and OPT2 based on the windowmanager used
|
||||
OPT1=
|
||||
OPT2=
|
||||
+OPT3=
|
||||
if [ ! -z "$SMID" ] ; then
|
||||
case `basename $WINDOW_MANAGER` in
|
||||
sawfish|sawmill|metacity)
|
||||
OPT1=--sm-client-id=$SMID
|
||||
;;
|
||||
+ compiz)
|
||||
+ export LIBGL_ALWAYS_INDIRECT=1
|
||||
+ gtk-window-decorator &
|
||||
+ OPT1=--sm-client-id
|
||||
+ OPT2=$SMID
|
||||
+ OPT3=gconf
|
||||
+ ;;
|
||||
openbox)
|
||||
OPT1=--sm-client-id
|
||||
OPT2=$SMID
|
||||
@@ -88,6 +100,6 @@ if [ ! -z "$SMID" ] ; then
|
||||
esac
|
||||
fi
|
||||
|
||||
-exec $WINDOW_MANAGER $OPT1 $OPT2
|
||||
+exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3
|
||||
|
||||
echo "ERROR: No window manager could run!"
|
||||
@ -1,5 +1,6 @@
|
||||
--- gnome-session-2.17.5/data/gnome-session.schemas.in.window-manager 2007-01-08 17:32:28.000000000 -0500
|
||||
+++ gnome-session-2.17.5/data/gnome-session.schemas.in 2007-01-11 14:05:30.000000000 -0500
|
||||
diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome-session-2.19.6/data/gnome-session.schemas.in
|
||||
--- gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager 2007-07-30 16:07:16.000000000 -0400
|
||||
+++ gnome-session-2.19.6/data/gnome-session.schemas.in 2007-08-09 17:40:50.000000000 -0400
|
||||
@@ -2,11 +2,22 @@
|
||||
<gconfschemafile>
|
||||
<schemalist>
|
||||
@ -24,8 +25,9 @@
|
||||
<locale name="C">
|
||||
<short>Show the splash screen</short>
|
||||
<long>Show the splash screen when the session starts up</long>
|
||||
--- gnome-session-2.17.5/gnome-session/gnome-wm.window-manager 2007-01-08 17:32:28.000000000 -0500
|
||||
+++ gnome-session-2.17.5/gnome-session/gnome-wm 2007-01-11 14:08:11.000000000 -0500
|
||||
diff -up gnome-session-2.19.6/gnome-session/gnome-wm.window-manager gnome-session-2.19.6/gnome-session/gnome-wm
|
||||
--- gnome-session-2.19.6/gnome-session/gnome-wm.window-manager 2007-07-30 16:07:15.000000000 -0400
|
||||
+++ gnome-session-2.19.6/gnome-session/gnome-wm 2007-08-09 17:44:21.000000000 -0400
|
||||
@@ -3,7 +3,9 @@
|
||||
# The user can specify his prefered WM by setting the WINDOW_MANAGER
|
||||
# environment variable.
|
||||
@ -37,7 +39,7 @@
|
||||
# the first one that is found in the users's PATH
|
||||
#
|
||||
|
||||
@@ -38,6 +40,9 @@
|
||||
@@ -38,6 +40,9 @@ for n in "$@" ; do
|
||||
done
|
||||
|
||||
# WINDOW_MANAGER overrides all
|
||||
@ -47,3 +49,11 @@
|
||||
|
||||
if [ -z "$WINDOW_MANAGER" ] ; then
|
||||
# Create a list of window manager we can handle, trying to only use the
|
||||
@@ -117,6 +122,7 @@ fi
|
||||
|
||||
case `basename $WINDOW_MANAGER` in
|
||||
compiz)
|
||||
+ export LIBGL_ALWAYS_INDIRECT=1
|
||||
gtk-window-decorator &
|
||||
OPT3=gconf
|
||||
;;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
Summary: GNOME session manager
|
||||
Name: gnome-session
|
||||
Version: 2.19.6
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
URL: http://www.gnome.org
|
||||
Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
|
||||
Source1: redhat-default-session
|
||||
@ -185,6 +185,9 @@ fi
|
||||
%doc %{_datadir}/man/man*/*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 9 2007 Kristian Høgsberg <krh@redhat.com> - 2.19.6-4
|
||||
- Edit the right window manager patch and delete the old one.
|
||||
|
||||
* Thu Aug 9 2007 Kristian Høgsberg <krh@redhat.com> - 2.19.6-3
|
||||
- Export LIBGL_ALWAYS_INDIRECT before starting compiz.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user