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

third_party/xdg-utils/scripts/xdg-icon-resource.in

 #!/bin/sh
 #---------------------------------------------
 #   xdg-icon-resource
 #
 #   Utility script to install icons on a Linux desktop.
 #
 #   Refer to the usage() function below for usage.
 #
 #   Copyright 2006, Kevin Krammer <kevin.krammer@gmx.at>
 #   Copyright 2006, Jeremy White <jwhite@codeweavers.com>
@@ skipping 15 matching lines @@
 }
 
 #@xdg-utils-common@
 
 # Set GTK_UPDATE_ICON_CACHE to gtk-update-icon-cache executable path or
 # to "-" if not found.
 GTK_UPDATE_ICON_CACHE=
 find_gtk_update_icon_cache()
 {
     [ -n "$GTK_UPDATE_ICON_CACHE" ] && return;
- 
-    GTK_UPDATE_ICON_CACHE="-"   
+
+    GTK_UPDATE_ICON_CACHE="-"
     for x in `echo "$PATH:/opt/gnome/bin" | sed 's/:/ /g'`; do
         DEBUG 3 "Checking $x for gtk-update-icon-cache"
         if [ -x "$x/gtk-update-icon-cache" ] ; then
             DEBUG 1 "Found $x/gtk-update-icon-cache"
             GTK_UPDATE_ICON_CACHE="$x/gtk-update-icon-cache"
             return
         fi
     done
 }
 
 # Start GNOME legacy workaround section
 need_dot_icon_path()
 {
   # GTK < 2.6 uses ~/.icons but not XDG_DATA_HOME/icons
   # The availability of gtk-update-icon-cache is used as indication
   # of whether the system is using GTK 2.6 or later
   find_gtk_update_icon_cache
-  [ "$GTK_UPDATE_ICON_CACHE" != "-" ] && return 1; 
+  [ "$GTK_UPDATE_ICON_CACHE" != "-" ] && return 1;
   return 0;
 }
 
 update_icon_database()
 {
    # Touch me, I'm dirty
    touch "$1/.@NAME@-dummy"
    rm -f "$1/.@NAME@-dummy"
 
    # Don't create a cache if there wan't one already
    if [ -f "$1/icon-theme.cache" ] ; then
       find_gtk_update_icon_cache
-      if [ "$GTK_UPDATE_ICON_CACHE" != "-" ] ; then 
+      if [ "$GTK_UPDATE_ICON_CACHE" != "-" ] ; then
          DEBUG 1 "Running $GTK_UPDATE_ICON_CACHE -f -t \"$1\""
          eval '$GTK_UPDATE_ICON_CACHE -f -t "$1"'$xdg_redirect_output
          return
       fi
    fi
 }
 
 [ x"$1" != x"" ] || exit_failure_syntax
 
 mode=
@@ skipping 40 matching lines @@
             exit_failure_syntax "mode argument missing for --mode"
         fi
         case "$1" in
           user)
             mode="user"
             ;;
 
           system)
             mode="system"
             ;;
-            
+
           *)
             exit_failure_syntax "unknown mode '$1'"
             ;;
         esac
         shift
         ;;
 
       --theme)
         if [ -z "$1" ] ; then
             exit_failure_syntax "theme argument missing for --theme"
@@ skipping 197 matching lines @@
   [ $needed -eq "1" ] && DEBUG 2 "need_kde_icon_path RETURN $needed (not needed)"
   [ $needed -eq "0" ] && DEBUG 2 "need_kde_icon_path RETURN $needed (needed)"
   return $needed
 }
 
 kde_dir=
 if [ x"$mode" = x"user" ] ; then
     xdg_dir="$xdg_base_dir/$xdg_size_name/$context"
     #KDE 3.x doesn't support XDG_DATA_HOME for icons
     #Check if xdg_dir prefix is listed by kde-config --path icon
-    #If not, install additional symlink to kdedir 
+    #If not, install additional symlink to kdedir
     if need_kde_icon_path "$xdg_user_prefix" ; then
-        kde_user_dir="$HOME/.kde/share/icons/$theme"
+        kde_user_icon_dir=`kde${KDE_SESSION_VERSION}-config --path icon | cut -d ':' -f 1`
+        kde_user_dir="$kde_user_icon_dir/$theme"
         kde_dir="$kde_user_dir/$xdg_size_name/$context"
     fi
     #Gnome 2.8 supports ~/.icons but not XDG_DATA_HOME
     if [ -n "$dot_icon_dir" ] ; then
         if [ -L "$dot_icon_dir" ] ; then
             # Don't do anything
             dot_icon_dir=
         elif [ ! -d "$dot_icon_dir/" ] ; then
             # Symlink if it doesn't exist
             eval 'ln -s ".local/share/icons" "$dot_icon_dir"'$xdg_redirect_output
             dot_icon_dir=
         else
             dot_icon_dir="$dot_icon_dir/$theme/$xdg_size_name/$context"
         fi
     fi
     my_umask=077
 else
     xdg_dir="$xdg_base_dir/$xdg_size_name/$context"
     #KDE 3.x doesn't support XDG_DATA_DIRS for icons
     #Check if xdg_dir prefix is listed by kde-config --path icon
-    #If not, install additional symlink to kdedir 
+    #If not, install additional symlink to kdedir
     if need_kde_icon_path "$xdg_global_prefix" ; then
         kde_global_dir="$kde_global_prefix/$theme"
         kde_dir="$kde_global_dir/$xdg_size_name/$context"
     fi
     my_umask=022
 fi
 # End KDE legacy workaround section
 
 # Start GNOME legacy workaround section
 need_gnome_mime=
-[ $context = "mimetypes" ] && need_gnome_mime=true 
+[ $context = "mimetypes" ] && need_gnome_mime=true
 # End GNOME legacy workaround section
 
 [ -n "$icon_name" ] || icon_name=`basename "$icon_file" | sed 's/\.[a-z][a-z][a-z]$//'`
 
 if [ "$vendor" = "true" -a "$action" = "install" -a "$context" = "apps" ] ; then
     check_vendor_prefix "$icon_name" "icon name"
 fi
 
 icon_icon_file=`echo "$icon_file" | sed 's/\.[a-z][a-z][a-z]$/.icon/'`
 icon_icon_name="$icon_name.icon"
@@ skipping 25 matching lines @@
         fi
 
         umask $save_umask
         ;;
 
     uninstall)
         for icon_dir in $xdg_dir $dot_icon_dir; do
             rm -f "$icon_dir/$icon_name.xpm" "$icon_dir/$icon_name.png"
             rm -f "$icon_dir/$icon_icon_name"
             if [ -n "$need_gnome_mime" ] ; then
-                rm -f "$icon_dir/gnome-mime-$icon_name.xpm" 
-                rm -f "$icon_dir/gnome-mime-$icon_name.png" 
+                rm -f "$icon_dir/gnome-mime-$icon_name.xpm"
+                rm -f "$icon_dir/gnome-mime-$icon_name.png"
             fi
         done
         if [ -n "$kde_dir" ] ; then
             rm -f "$kde_dir/$icon_name.xpm" "$kde_dir/$icon_name.png"
         fi
 
         ;;
 esac
 
 if [ x"$update" = x"yes" ] ; then
     update_icon_database "$xdg_base_dir"
     if [ -n "$dot_icon_dir" ] ; then
         if [ -d "$dot_icon_dir/" -a ! -L "$dot_icon_dir" ] ; then
             update_icon_database $dot_base_dir
         fi
     fi
 fi
 
 exit_success