gdm r6480 - in trunk: . data

[mccann svn gnome org]

Author: mccann
Date: Mon Sep  8 20:00:36 2008
New Revision: 6480
URL: http://svn.gnome.org/viewvc/gdm?rev=6480&view=rev

Log:
2008-09-08  William Jon McCann  <jmccann redhat com>

	* data/PreSession.in: Don't set the background color in the
	presession script.  Spotted by Owen Taylor.
	Fixes #545337.



Modified:
   trunk/ChangeLog
   trunk/data/PreSession.in

Modified: trunk/data/PreSession.in
==============================================================================
--- trunk/data/PreSession.in	(original)
+++ trunk/data/PreSession.in	Mon Sep  8 20:00:36 2008
@@ -25,50 +25,6 @@
   echo "$OUTPUT"
 }
 
-# Set background color
-XSETROOT=`gdmwhich xsetroot`
-if [ "x$XSETROOT" != "x" ] ; then
-
-	CHECKBACKCOLOR="OK"
-	if [ "x$GDM_GREETER_TYPE" = "xTHEMED" ]; then
-		BACKCOLOR=`gdmflexiserver --command="GET_CONFIG greeter/GraphicalThemedColor $DISPLAY"`
-
-		CHECKBACKCOLOR=`echo $BACKCOLOR | sed 's/^\([^ ]*\) .*$/\1/'`
-		if [ "x$CHECKBACKCOLOR" = "xOK" ]; then
-			BACKCOLOR=`echo $BACKCOLOR | sed 's/^.* \(.*\)$/\1/'`
-		else
-			BACKCOLOR=""
-		fi
-	fi
-
-	# If we tried to load the themed backgroundcolor, but failed, then try loading plain color
-	if [ "x$CHECKBACKCOLOR" != "xOK" ] || [ "x$GDM_GREETER_TYPE" = "xPLAIN" ]; then
-
-		# Background type can be 0=None, 1=Image & Color, 2=Color, or 3=Image
-		BACKTYPE=`gdmflexiserver --command="GET_CONFIG greeter/BackgroundType $DISPLAY"`
-
-		# Skip if background type does not include a color
-		if [ "x$BACKTYPE" = "xOK 1" ] || [ "x$BACKTYPE" = "xOK 2" ]; then
-			BACKCOLOR=`gdmflexiserver --command="GET_CONFIG greeter/BackgroundColor $DISPLAY"`
-
-			CHECKBACKCOLOR=`echo $BACKCOLOR | sed 's/^\([^ ]*\) .*$/\1/'`
-			if [ "x$CHECKBACKCOLOR" = "xOK" ]; then
-				BACKCOLOR=`echo $BACKCOLOR | sed 's/^.* \(.*\)$/\1/'`
-			else
-				BACKCOLOR=""
-			fi
-		fi
-	fi
-
-	# Default value
- 	if [ "x$BACKCOLOR" = "x" ]; then
- 		BACKCOLOR="#76848F"
- 	fi
-
-	"$XSETROOT" -cursor_name left_ptr -solid "$BACKCOLOR"
-fi
-
-
 SESSREG=`gdmwhich sessreg`
 if [ "x$SESSREG" != "x" ] ; then
 	# some output for easy debugging