Update our copy of xdg-utils to 2010-08-30, and include a patched xdg-mime.

third_party/xdg-utils/scripts/xdg-screensaver

 #!/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 212 matching lines @@
 exit_failure_file_permission_read()
 {
     if [ $# -gt 0 ]; then
         echo "xdg-screensaver: $@" >&2
     fi
 
     exit 5
 }
 
 #------------------------------------------------------------
-# Exit script on insufficient permission to read a specified file
+# Exit script on insufficient permission to write a specified file
 
 exit_failure_file_permission_write()
 {
     if [ $# -gt 0 ]; then
         echo "xdg-screensaver: $@" >&2
     fi
 
     exit 6
 }
 
@@ skipping 56 matching lines @@
             echo "Use 'man xdg-screensaver' or 'xdg-screensaver --manual' for additional info."
             exit_success
             ;;
 
             --manual)
             manualpage
             exit_success
             ;;
 
             --version)
-            echo "xdg-screensaver 1.0.1"
+            echo "xdg-screensaver 1.0.2"
             exit_success
             ;;
         esac
     done
 }
 
 check_common_commands "$@"
 
 [ -z "${XDG_UTILS_DEBUG_LEVEL}" ] && unset XDG_UTILS_DEBUG_LEVEL;
 if [ ${XDG_UTILS_DEBUG_LEVEL-0} -lt 1 ]; then
     # Be silent
     xdg_redirect_output=" > /dev/null 2> /dev/null"
 else
     # All output to stderr
     xdg_redirect_output=" >&2"
 fi
 
 #--------------------------------------
 # Checks for known desktop environments
 # set variable DE to the desktop environments name, lowercase
 
 detectDE()
 {
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
-    elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+    elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+    elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
     fi
 }
 
 #----------------------------------------------------------------------------
 # kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4
 # It also always returns 1 in KDE 3.4 and earlier
 # Simply return 0 in such case
 
 kfmclient_fix_exit_code()
 {
     version=`kde${KDE_SESSION_VERSION}-config --version 2>/dev/null | grep KDE`
     major=`echo $version | sed 's/KDE: \([0-9]\).*/\1/'`
     minor=`echo $version | sed 's/KDE: [0-9]*\.\([0-9]\).*/\1/'`
     release=`echo $version | sed 's/KDE: [0-9]*\.[0-9]*\.\([0-9]\).*/\1/'`
     test "$major" -gt 3 && return $1
     test "$minor" -gt 5 && return $1
     test "$release" -gt 4 && return $1
     return 0
 }
 
-# Check if we can use "mv -T" 
+# 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'`
 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
      local try
      try=0
      while ! ln -s "$screensaver_file".lock "$screensaver_file".lock 2> /dev/null;
      do
         sleep 1
         try=$(($try+1))
-        if [ $try -eq 3 ] ; then 
+        if [ $try -eq 3 ] ; then
             rm -f "$screensaver_file".lock || return # Can't remove lockfile
             try=0
         fi
      done
   fi
 }
 
 unlockfile()
 {
   rm -f "$screensaver_file".lock
@@ skipping 12 matching lines @@
       fi
   fi
   if [ "$1" = "reset" ] ; then
       if xset -q | grep 'DPMS is Enabled' > /dev/null 2> /dev/null; then
           xset dpms force on
       fi
   fi
 
   case "$DE" in
     kde)
-      screensaver_kde "$1"
+      if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
+          screensaver_freedesktop "$1"
+      else
+          screensaver_kde "$1"
+      fi
       ;;
 
-    gnome)
-      screensaver_gnome "$1"
+    gnome_screensaver)
+      screensaver_gnome_screensaver "$1"
       ;;
 
     xscreensaver)
       screensaver_xscreensaver "$1"
       ;;
   esac
 
   if [ "$1" = "suspend" ] ; then
       # Save DPMS state
       if xset -q | grep 'DPMS is Enabled' > /dev/null 2> /dev/null; then
@@ skipping 21 matching lines @@
       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` 
+  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 the tracking process
      kill -s TERM $xprop_pid
   fi
-  cleanup_suspend  
+  cleanup_suspend
 }
 
 XPROP=`which xprop 2> /dev/null`
 
 check_window_id()
 {
   if [ -z "$XPROP" ]; then
      DEBUG 3 "xprop not found"
      return
-  fi 
+  fi
   DEBUG 2 "Running $XPROP -id $window_id"
   if $XPROP -id $window_id > /dev/null 2> /dev/null; then
      DEBUG 3 Window $window_id exists
   else
      DEBUG 3 Window $window_id does not exist
      exit_failure_operation_failed "Window $window_id does not exist"
   fi
 }
 
 track_window()
@@ skipping 10 matching lines @@
   # Return if $window_id is being tracked already
   (
     already_tracked=1
     IFS_save="$IFS"
     IFS=":"
     while read wid pid; do
       if ps -p "$pid" 2> /dev/null | grep xprop > /dev/null; then
         echo "$wid:$pid"
         if [ $wid = $window_id ] ; then
           already_tracked=0
-        fi   
+        fi
       fi
     done
     IFS="$IFS_save"
     exit $already_tracked
   ) < $screensaver_file > $tmpfile
   already_tracked=$?
 
   if [ "$already_tracked" -eq "0" ] ; then
     $MV "$tmpfile" "$screensaver_file"
     # We are already tracking $window_id, don't do anything
     unlockfile
     return
   fi
 
   # Start tracking $window_id
   $XPROP -id $window_id -spy > /dev/null &
   xprop_pid=$!
   # Add window_id and xprop_pid to the xdg-screensave status file
   echo "$window_id:$xprop_pid" >> $tmpfile
   $MV "$tmpfile" "$screensaver_file"
   unlockfile
   # Wait for xprop to edit, it means that the window disappeared
   wait $xprop_pid
   # Clean up the administration and resume the screensaver
   cleanup_suspend
 }
 
-screensaver_freedesktop()                                                                                  
-{                                                                                                          
-    case "$1" in                                                                                           
-        suspend)                                                                                           
-        #FIXME (get/store cookie)                                                                          
-        qdbus org.freedesktop.ScreenSaver /ScreenSaver org.freedesktop.ScreenSaver.Inhibit $window_id xdg-screensaver  > /dev/null                                                                                           
-        result=$?                                                                                             
-        ;;                                                                                                    
-                                                                                                              
-        resume)                                                                                               
-        qdbus org.freedesktop.ScreenSaver /ScreenSaver org.freedesktop.ScreenSaver.SetActive true > /dev/null 
-        result=$?                                                                                             
-        ;;                                                                                                    
-                                                                                                              
-        activate)                                                                                             
-        qdbus org.freedesktop.ScreenSaver /ScreenSaver org.freedesktop.ScreenSaver.SetActive true > /dev/null 
-        result=$?                                                                                             
-        ;;                                                                                                    
-                                                                                                              
-        lock)                                                                                                 
-        qdbus org.freedesktop.ScreenSaver /ScreenSaver org.freedesktop.ScreenSaver.Lock > /dev/null           
-        ;;                                                                                                    
-                                                                                                              
-        reset)                                                                                                
-        #FIXME (cookies?)                                                                                     
-        qdbus org.freedesktop.ScreenSaver /ScreenSaver org.freedesktop.ScreenSaver.UnInhibit $window_id > /dev/null                                                                                                          
-        result=$?                                                                                             
-        ;;                                                                                                    
-                                                                                                              
-        status)                                                                                               
-        status=`qdbus org.freedesktop.ScreenSaver /ScreenSaver org.freedesktop.ScreenSaver.GetActive`
+screensaver_freedesktop()
+{
+    case "$1" in
+        suspend)
+        dbus-send --session \
+                  --dest=org.freedesktop.ScreenSaver \
+                  --type=method_call \
+                  --print-reply \
+                  --reply-timeout=2000 \
+                  /ScreenSaver \
+                  org.freedesktop.ScreenSaver.Inhibit \
+                  string:$window_id \
+                  string:xdg-screensaver \
+                  | grep uint32 | cut -d ' ' -f 5 >| "$screensaver_file.cookie" \
+                  2> /dev/null
+        result=$?
+        ;;
+
+        resume)
+        if [ -f "$screensaver_file.cookie" ] ; then
+            value=`cat "$screensaver_file.cookie"`
+            dbus-send --session \
+                      --dest=org.freedesktop.ScreenSaver \
+                      --type=method_call \
+                      /ScreenSaver \
+                      org.freedesktop.ScreenSaver.UnInhibit \
+                      uint32:$value \
+                      2> /dev/null
+            rm -f "$screensaver_file.cookie"
+        fi
+        result=$?
+        ;;
+
+        activate)
+        dbus-send --session \
+                  --dest=org.freedesktop.ScreenSaver \
+                  --type=method_call \
+                  /ScreenSaver \
+                  org.freedesktop.ScreenSaver.SetActive \
+                  boolean:true \
+                  2> /dev/null
+        result=$?
+        ;;
+
+        lock)
+        dbus-send --session \
+                  --dest=org.freedesktop.ScreenSaver \
+                  --type=method_call \
+                  /ScreenSaver \
+                  org.freedesktop.ScreenSaver.Lock \
+                  2> /dev/null
+        ;;
+
+        reset)
+        if [ -f "$screensaver_file.cookie" ] ; then
+            value=`cat "$screensaver_file.cookie"`
+            dbus-send --session \
+                      --dest=org.freedesktop.ScreenSaver \
+                      --type=method_call \
+                      /ScreenSaver \
+                      org.freedesktop.ScreenSaver.UnInhibit \
+                      uint32:$value \
+                      2> /dev/null
+            rm -f "$screensaver_file.cookie"
+        fi
+        result=$?
+        ;;
+
+        status)
+        status=`dbus-send --session \
+                          --dest=org.freedesktop.ScreenSaver \
+                          --type=method_call \
+                          --print-reply \
+                          --reply-timeout=2000 \
+                          /ScreenSaver \
+                          org.freedesktop.ScreenSaver.GetActive \
+                          | grep boolean | cut -d ' ' -f 5`
         result=$?
         if [ x"$status" = "xtrue" ]; then
             echo "enabled"
         elif [ x"$status" = "xfalse" ]; then
             echo "disabled"
         else
             echo "ERROR: dbus org.freedesktop.ScreenSaver.GetActive returned '$status'" >&2
             return 1
         fi
         ;;
 
         *)
         echo "ERROR:  Unknown command '$1'" >&2
         return 1
         ;;
     esac
 }
 
 screensaver_kde()
 {
     case "$1" in
-        suspend) 
+        suspend)
         dcop kdesktop KScreensaverIface enable false > /dev/null
         result=$?
         ;;
 
         resume)
         dcop kdesktop KScreensaverIface configure > /dev/null
         result=$?
         ;;
-        
+
         activate)
         dcop kdesktop KScreensaverIface save > /dev/null
         result=$?
         ;;
 
         lock)
         dcop kdesktop KScreensaverIface lock > /dev/null
         result=$?
         ;;
-        
+
         reset)
         # Turns the screensaver off right now
         dcop kdesktop KScreensaverIface quit > /dev/null
         result=$?
         ;;
 
         status)
         status=`dcop kdesktop KScreensaverIface isEnabled`
         result=$?
         if [ x"$status" = "xtrue" ]; then
@@ skipping 26 matching lines @@
       if ps -p "$pid" 2> /dev/null | grep xprop > /dev/null; then
         echo "$wid:$pid"
       fi
     done
     IFS="$IFS_save"
   ) > $tmpfile
   if [ -s "$tmpfile" ] ; then
     # Suspend pending, don't do a thing
     $MV "$tmpfile" "$screensaver_file"
     unlockfile
-    return  
+    return
   fi
   $MV "$tmpfile" "$screensaver_file"
   unlockfile
   (while [ -f "$screensaver_file" ]; do $*; sleep 50; done) > /dev/null 2> /dev/null &
 }
 
-screensaver_gnome()
+screensaver_gnome_screensaver()
 {
 # 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
     case "$1" in
-        suspend) 
+        suspend)
         screensaver_suspend_loop gnome-screensaver-command --poke
         result=0
         ;;
 
         resume)
         # Automatic resume when $screensaver_file disappears
         result=0
         ;;
-        
+
         activate)
         gnome-screensaver-command --activate > /dev/null 2> /dev/null
         result=$?
         ;;
-        
+
         lock)
         gnome-screensaver-command --lock > /dev/null 2> /dev/null
         result=$?
         ;;
-        
+
         reset)
         # Turns the screensaver off right now
         gnome-screensaver-command --deactivate > /dev/null 2> /dev/null
         result=$?
         ;;
 
         status)
         result=0
         if [ -f "$screensaver_file" ] ; then
             echo "disabled"
         elif gnome-screensaver-command --query > /dev/null 2> /dev/null; then
             echo "enabled"
         else
             # Something is wrong
             echo "disabled"
         fi
         ;;
 
         *)
         echo "ERROR:  Unknown command '$1" >&2
         return 1
         ;;
     esac
 }
 
 screensaver_xscreensaver()
 {
     case "$1" in
-        suspend) 
+        suspend)
         screensaver_suspend_loop xscreensaver-command -deactivate
         result=0
         ;;
 
         resume)
         # Automatic resume when $screensaver_file disappears
         result=0
         ;;
-        
+
         activate)
         xscreensaver-command -activate > /dev/null 2> /dev/null
         result=$?
         ;;
 
         lock)
         xscreensaver-command -lock > /dev/null 2> /dev/null
         result=$?
         ;;
-        
+
         reset)
         # Turns the screensaver off right now
         xscreensaver-command -deactivate > /dev/null 2> /dev/null
         result=$?
         ;;
 
         status)
         result=0
         if [ -f "$screensaver_file" ] ; then
             echo "disabled"
@@ skipping 10 matching lines @@
 }
 
 [ x"$1" != x"" ] || exit_failure_syntax
 
 action=
 window_id=
 
 case $1 in
   suspend)
     action="$1"
-    
+
     shift
 
-    if [ -z "$1" ] ; then 
+    if [ -z "$1" ] ; then
         exit_failure_syntax "WindowID argument missing"
     fi
-    
+
     window_id="$1"
     check_window_id
     ;;
 
   resume)
     action="$1"
-    
+
     shift
 
-    if [ -z "$1" ] ; then 
+    if [ -z "$1" ] ; then
         exit_failure_syntax "WindowID argument missing"
     fi
-    
+
     window_id="$1"
     check_window_id
     ;;
 
   activate)
     action="$1"
     ;;
 
   lock)
     action="$1"
     ;;
 
   reset)
     action="$1"
     ;;
 
   status)
     action="$1"
     ;;
-    
+
   *)
     exit_failure_syntax "unknown command '$1'"
     ;;
 esac
 
 detectDE
 # Consider "xscreensaver" a separate DE
 xscreensaver-command -version 2> /dev/null | grep XScreenSaver > /dev/null && DE="xscreensaver"
+# Consider "gnome-screensaver" a separate DE 
+gnome-screensaver-command -q > /dev/null 2>&1 && DE="gnome_screensaver"
 
 if [ "$action" = "resume" ] ; then
     do_resume
     exit_success
 fi
 
 perform_action "$action"
 
 if [ "$action" = "suspend" ] ; then
     # Start tracking $window_id and resume the screensaver once it disappears
     ( track_window  ) 2> /dev/null > /dev/null &
-fi        
+fi
 
 if [ $result -eq 0 ]; then
     exit_success
 else
     exit_failure_operation_failed
 fi