diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-09-08 20:00:36 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-09-08 20:00:36 +0000 |
| commit | f16be6e59c8c51af040c6ecefc183cf8979ae0c8 (patch) | |
| tree | d69c97aa11512e2aa0e82dc65a10ba1d2aa8c73e /data/PreSession.in | |
| parent | 83dbf74a1ad124a60f50a68b18921007472d48bd (diff) | |
| download | gdm-f16be6e59c8c51af040c6ecefc183cf8979ae0c8.tar.gz | |
Don't set the background color in the presession script. Spotted by Owen
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.
svn path=/trunk/; revision=6480
Diffstat (limited to 'data/PreSession.in')
| -rwxr-xr-x | data/PreSession.in | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/data/PreSession.in b/data/PreSession.in index 7f444b6e..8e48f793 100755 --- a/data/PreSession.in +++ b/data/PreSession.in @@ -25,50 +25,6 @@ gdmwhich () { 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 |