File compiz-manager-cleanup.patch of Package compiz-manager

--- compiz-manager-0.0.1_git080201/compiz-manager	2008-03-13 18:46:12.000000000 +0530
+++ compiz-manager-0.0.1_git080201/compiz-manager.new	2008-05-13 22:04:03.000000000 +0530
@@ -49,7 +49,7 @@
 # For Xgl LD_PRELOAD
 LIBGL_NVIDIA=""
 LIBGL_FGLRX=""
-
+LD_LIBRARY_PATH=/usr/X11R6/$LIB/
 # Minimum amount of memory (in kilo bytes) that nVidia cards need
 # to be allowed to start
 # Set to 262144 to require 256MB
@@ -78,12 +78,12 @@
 BLACKLIST_PCIIDS="$T"
 unset T
 
-COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
+COMPIZ_OPTIONS="--ignore-desktop-hints "
 COMPIZ_PLUGINS=""
 ENV=""
 
 # Use emerald by default if it exist
-USE_EMERALD="yes"
+USE_EMERALD=""
 
 # No indirect by default
 INDIRECT="no"
@@ -274,12 +274,7 @@
  		if egrep -q "Loading .*${DRV}_drv\.so" $LOG &&
 			! egrep -q "Unloading .*${DRV}_drv\.so" $LOG; 
 		then
-			if [  x"$DRV" = x"nvidia" -o x"$DRV" = x"fglrx" ]; then
-				COMPIZ_OPTIONS="$COMPIZ_OPTIONS --no-libgl-fallback"
-				LIBGL_ALWAYS_INDIRECT=1
-				LD_LIBRARY_PATH=/usr/X11R6/lib
-			fi
-		return 0
+			return 0
 		fi
 	done
 	verbose "No whitelisted driver found\n"
@@ -389,7 +384,7 @@
 if [ -f ${PLUGIN_PATH}libccp.so ]; then
 	COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp"
 elif [ -f ${PLUGIN_PATH}libgconf.so ]; then
-	COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf"
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS core glib gconf"
 fi
 
 # get environment
@@ -401,26 +396,6 @@
 	exit 0;
 fi
 
-if [ -f $HOME/.config/compiz/disable-compiz ]; then
-	abort_with_fallback_wm
-fi
-
-# start the gtk-window-decorator if present
-if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
-        verbose "Starting emerald\n"
-        pgrep emerald || ${COMPIZ_BIN_PATH}emerald --replace &
-elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
-	verbose "Starting gtk-window-decorator\n"
-	pgrep gtk-window-decorator || ${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
-	FALLBACKWM="${METACITY}"
-elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
-	verbose "Starting kde-window-decorator\n"
-	pgrep kde-window-decorator || ${COMPIZ_BIN_PATH}kde-window-decorator --replace &
-	FALLBACKWM="${KWIN}"
-elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ] && [ x$KDE_SESSION_VERSION = x"4" ]; then
-        pgrep kde4-window-decorator || ${COMPIZ_BIN_PATH}kde4-window-decorator --replace &
-fi
-
 if [ x$FUSION_ICON = "x/usr/bin/fusion-icon" ] ; then
 	pgrep fusion-icon || ${FUSION_ICON} -n &
 fi
openSUSE Build Service is sponsored by