Bring xdg-utils up to date as of 2009-07-27.

third_party/xdg-utils/scripts/xdg-screensaver.in

 #!/bin/sh
 #---------------------------------------------
 #   xdg-screensaver
 #
 #   Utility script to control screensaver.
 #
 #   Refer to the usage() function below for usage.
 #
 #   Copyright 2006, Bryce Harrington <bryce@osdl.org>
 #
@@ skipping 18 matching lines @@
 # Check if we can use "mv -T" 
 if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
    # We can securely move files in /tmp with mv -T
    DEBUG 1 "mv -T available"
    MV="mv -T"
    screensaver_file="/tmp/xdg-screensaver-$USER-"`echo $DISPLAY | sed 's/:/-/g'`
 else
    # No secure moves available, use home dir
    DEBUG 1 "mv -T not available"
    MV="mv"
-   screensaver_file="$HOME/.xdg-screensaver-"`echo $HOSTNAME-$DISPLAY | sed 's/:/-/g'`
+   screensaver_file="$HOME/.xdg-screensaver-"`echo $(hostname)-$DISPLAY | sed 's/:/-/g'`
 fi
 lockfile_command=`which lockfile 2> /dev/null`
 
 lockfile()
 {
   if [ -n "$lockfile_command" ] ; then
      $lockfile_command -1 -l 10 -s 3 "$screensaver_file".lock
   else
      # Poor man's attempt at doing a lockfile
      # Be careful not to facilitate a symlink attack
@@ skipping 59 matching lines @@
       fi
   fi
 
 }
 
 cleanup_suspend()
 {
   lockfile
   test "${TMPDIR+set}" = set || TMPDIR=/tmp
   tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
-  grep -v "$window_id:" "$screensaver_file" > "$tmpfile" 2> /dev/null
+  grep -v "$window_id:$xprop_pid\$" "$screensaver_file" > "$tmpfile" 2> /dev/null
   $MV "$tmpfile" "$screensaver_file"
   if [ ! -s "$screensaver_file" ] ; then
       rm "$screensaver_file"
       unlockfile
       # $screensaver_file is empty, do resume
       perform_action resume
   else
       unlockfile
   fi
 }
 
 do_resume()
 {
   lockfile # Obtain lockfile
   # Find the PID of the trackingprocess
   xprop_pid=`grep "$window_id:" "$screensaver_file" 2> /dev/null | cut -d ':' -f 2` 
   unlockfile # Free lockfile
   if [ -n "$xprop_pid" ] && ps -p "$xprop_pid" 2> /dev/null | grep xprop > /dev/null; then
      # Kill the tracking process 
-     kill -TERM $xprop_pid
+     kill -s TERM $xprop_pid
   fi
   cleanup_suspend  
 }
 
 XPROP=`which xprop 2> /dev/null`
 
 check_window_id()
 {
   if [ -z "$XPROP" ]; then
      DEBUG 3 "xprop not found"
@@ skipping 172 matching lines @@
     IFS="$IFS_save"
   ) > $tmpfile
   if [ -s "$tmpfile" ] ; then
     # Suspend pending, don't do a thing
     $MV "$tmpfile" "$screensaver_file"
     unlockfile
     return  
   fi
   $MV "$tmpfile" "$screensaver_file"
   unlockfile
-  (while [ -f "$screensaver_file" ]; do $*; sleep 59; done) > /dev/null 2> /dev/null &
+  (while [ -f "$screensaver_file" ]; do $*; sleep 50; done) > /dev/null 2> /dev/null &
 }
 
 screensaver_gnome()
 {
 # TODO
 # There seems to be a DBUS interface for gnome-screensaver
 # See http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-April/042579.html and
 # http://cvs.gnome.org/viewcvs/gnome-screensaver/src/gs-listener-dbus.c?rev=1.36&view=log
 # A problem seems to be that Inhibit is tied to the lifetime of the DBUS appname and
 # this can not be used from a script
@@ skipping 155 matching lines @@
 if [ "$action" = "suspend" ] ; then
     # Start tracking $window_id and resume the screensaver once it disappears
     ( track_window  ) 2> /dev/null > /dev/null &
 fi        
 
 if [ $result -eq 0 ]; then
     exit_success
 else
     exit_failure_operation_failed
 fi