5,6d4
< #  Copyright (C) 1999, 2003 Olivier Fourdan (fourdan@xfce.org)
< #
22,27c20,44
< if test x"`which xscreensaver-command 2>/dev/null`" != x""; then
<     xscreensaver-command -lock 
< elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then
<     gnome-screensaver-command --lock
< else
<     xlock $*
---
> case "$DESKTOP_LOCK_UTILITY" in
>     xscreensaver )
> 	if xscreensaver-command -lock 2>/dev/null; then
> 	  exit 0
>         fi
>     ;;   
>     gnome-screensaver )
> 	if gnome-screensaver-command --lock 2>/dev/null; then
> 	  exit 0
>         fi
>     ;;
>     xtrlock )
> 	# xtrlock leaves desktop visible
>         if test -n "`which xtrlock 2>/dev/null`"; then
> 	  xtrlock &
>           exit 0
>         fi
>    ;;
> 
> esac
> 
> # Try xlock by default and if nothing else works
> if test -n "`which xlock 2>/dev/null`"; then
>   xlock -mode blank $* &
>   exit 0
29c46,47
< exit 0
---
> 
> exit 1