- start gnome-window-decorator and pass "gconf" when invoking compiz

This commit is contained in:
Ray Strode 2006-08-11 20:06:25 +00:00
parent bf0fa15ff7
commit 11e6e7462b
2 changed files with 35 additions and 5 deletions

View File

@ -1,5 +1,5 @@
--- 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
+++ 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>
@ -24,8 +24,8 @@
<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
--- 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.
@ -37,7 +37,7 @@
# the first one that is found in the users's PATH
#
@@ -39,6 +41,10 @@
@@ -39,6 +41,10 @@ done
# WINDOW_MANAGER overrides all
@ -48,3 +48,29 @@
OLDIFS=$IFS
IFS=":"
if [ -z "$WINDOW_MANAGER" ] ; then
@@ -67,11 +73,17 @@ 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)
+ gnome-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!"

View File

@ -14,7 +14,7 @@
Summary: GNOME session manager
Name: gnome-session
Version: 2.15.90
Release: 2%{?dist}
Release: 3%{?dist}
URL: http://www.gnome.org
Source0: %{name}-%{version}.tar.bz2
Source1: redhat-default-session
@ -167,6 +167,10 @@ done
%{_datadir}/gnome/autostart
%changelog
* Fri Aug 11 2006 Ray Strode <rstrode@redhat.com> - 2.15.90-3.fc6
- start gnome-window-decorator and pass "gconf" when invoking
compiz
* 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)