102c102
< # Launch xscreensaver (if available), but only as non-root user
---
> # Launch the preferred screensaver daemon (if available), but only as non-root user
104,108c104,118
<     if test x"`which xscreensaver 2>/dev/null`" != x""; then
<         xscreensaver -no-splash &
<     elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then
<         gnome-screensaver &
<     fi
---
> 
>    case "$SCREEN_SAVER_UTILITY" in
>     xscreensaver )
>         if test -n "`which xscreensaver 2>/dev/null`"; then
>            xscreensaver -no-splash &
>         fi
>     ;;   
>     gnome-screensaver )
>         if test -n "`which gnome-screensaver 2>/dev/null`"; then
>            gnome-screensaver
>            # Trailing & is not used after the command; consequently 
>            # the screensaver can be used immediately.
>         fi
>     ;;
>    esac