--- xfce-utils-4.4.0/scripts/xinitrc.kad	2007-03-28 14:58:48.000000000 +0300
+++ xfce-utils-4.4.0/scripts/xinitrc	2007-03-28 15:18:40.000000000 +0300
@@ -55,7 +55,13 @@
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
 
 # Launch xscreensaver (if available), but only as non-root user
-test $UID -gt 0 -a -z "$VNCSESSION" && xscreensaver -no-splash &
+if test $UID -gt 0 -a -z "$VNCSESSION"; then 
+    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
+fi 
 
 # Use ssh-agent if installed and not already running.  Run it separately
 # so it populates the environment here, so we can clean it up later.
--- xfce-utils-4.4.0/scripts/xflock4.kad	2007-03-28 15:18:46.000000000 +0300
+++ xfce-utils-4.4.0/scripts/xflock4	2007-03-28 15:20:34.000000000 +0300
@@ -19,5 +19,11 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-xscreensaver-command -lock || xlock $*
+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 $*
+fi
 exit 0