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

third_party/xdg-utils/scripts/xdg-desktop-menu.in

 #!/bin/sh
 #---------------------------------------------
 #   xdg-desktop-menu
 #
 #   Utility script to install menu items 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 22 matching lines @@
         for x in `echo $PATH | sed 's/:/ /g'` /opt/gnome/bin; do
            if [ -x $x/update-desktop-database ] ; then
               DEBUG 1 "Running $x/update-desktop-database"
               eval '$x/update-desktop-database'$xdg_redirect_output
               return
            fi
         done
     fi
 }
 
-fixup_mandriva_categories()
-{
-    DEBUG 1 "fixup_mandriva_categories $1"
-    awk '
-BEGIN {
-    xlat["AudioVideo"]="X-Mandrakelinux-Multimedia;X-MandrivaLinux-Multimedia"
-    xlat["Development"]="X-Mandrakelinux-MoreApplications-Development;X-MandrivaLinux-MoreApplications-Development"
-    xlat["Education"]="X-Mandrakelinux-MoreApplications;X-MandrivaLinux-MoreApplications-Education"
-    xlat["Game"]="X-Mandrakelinux-MoreApplications;X-MandrivaLinux-MoreApplications-Games"
-    xlat["Graphics"]="X-Mandrakelinux-Multimedia-Graphics"
-    xlat["Network"]="X-Mandrakelinux-Internet;X-MandrivaLinux-Internet"
-    xlat["Office"]="X-Mandrakelinux-Office;X-MandrivaLinux-Office"
-    xlat["System"]="X-Mandrakelinux-System;X-MandrivaLinux-System"
-    xlat["Utility"]="X-Mandrakelinux-Office-Accessories;X-MandrivaLinux-Office-Accessories"
-}
-{
-    if (match($0,/Categories=/)) {
-        split(substr($0,RSTART+11),categories,";")
-        result=""
-        for (n in categories)
-        {
-               if (categories[n] in xlat)
-                 categories[n]=categories[n] ";" xlat[categories[n]]
-               if (categories[n])
-                 result=result categories[n] ";"
-        }
-        print "Categories=" result
-    }
-    else
-    {
-        print $0
-    }
-}' $1 > $1.new
-    mv $1.new $1
-}
-
 # Make application $1/$2 the default for all the mimetypes it support,
 # iff such mimetype didn't had a default application already.
 # $1 Install dir for desktop file
 # $2 base name of desktop file
 make_lazy_default()
 {
     local mimetypes
     local xdg_user_dir
     local xdg_default_dirs
-    
+
     DEBUG 1 "make_lazy_default $1/$2"
     mimetypes=`awk '
 {
     if (match($0,/MimeType=/)) {
         split(substr($0,RSTART+9),mimetypes,";")
         for (n in mimetypes)
         {
                if (mimetypes[n])
                  print mimetypes[n]
         }
     }
 }' "$1/$2" 2> /dev/null`
-    
+
     for MIME in $mimetypes ; do
         xdg_default_dirs="$XDG_DATA_DIRS"
         [ -n "$xdg_default_dirs" ] || xdg_default_dirs=/usr/local/share/:/usr/share/
         if [ x"$mode" = x"user" ] ; then
             xdg_user_dir="$XDG_DATA_HOME"
             [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
             xdg_default_dirs="$xdg_user_dir:$xdg_default_dirs"
         fi
         local default_app
         for x in `echo "$xdg_default_dirs" | sed 's/:/ /g'`; do
@@ skipping 36 matching lines @@
     xdg_global_dir=
     for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
         if [ -w $x/$xdg_dir_name ] ; then
             xdg_global_dir="$x/$xdg_dir_name"
             break
         fi
     done
     xdg_user_dir="$xdg_user_dir/applications-merged"
     xdg_global_dir="$xdg_global_dir/applications-merged"
 
-    DEBUG 3 "Install locations for *.menu file:" 
+    DEBUG 3 "Install locations for *.menu file:"
     DEBUG 3 "xdg_user_dir: $xdg_user_dir"
     DEBUG 3 "xdg_global_dir: $xdg_global_dir"
     DEBUG 3 "kde_user_dir: $kde_user_dir"
     DEBUG 3 "kde_global_dir: $kde_global_dir"
     DEBUG 3 "gnome_user_dir: $gnome_user_dir"
     DEBUG 3 "gnome_global_dir: $gnome_global_dir"
 
     if [ x"$mode" = x"user" ] ; then
         xdg_dir="$xdg_user_dir"
         kde_dir="$kde_user_dir"
@@ skipping 42 matching lines @@
         fi
     fi
     if [ $action = "install" -a x"$mode" = x"user" -a -d "/etc/xdg/menus/kde-applications-merged" ] ; then
         # Work around for Fedora Core 5 + patched KDE
         kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'`
         if [ ! -e "$kde_xdg_dir" ] ; then
             DEBUG 1 "Fedora Workaround: Link '$xdg_dir' to '$kde_xdg_dir'"
             mkdir -p `dirname "$kde_xdg_dir"`
             eval 'ln -s "applications-merged" "$kde_xdg_dir"'$xdg_redirect_output
         fi
-    fi        
+    fi
     if [ $action = "install" -a x"$mode" = x"system" -a -d "/etc/xdg/menus/kde-applications-merged" -a ! -d "/etc/xdg/menus/applications-merged" ] ; then
         # Work around for Kubuntu 6.06
         kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'`
         DEBUG 1 "Kubuntu Workaround: Link '$xdg_dir' to 'kde-applications-merged'"
         eval 'ln -s "kde-applications-merged" "$xdg_dir"'$xdg_redirect_output
     fi
 
     orig_menu_file=$xdg_dir/$menu_file
 
     DEBUG 1 "Updating $orig_menu_file ($action)"
@@ skipping 34 matching lines @@
         # Files to uninstall are listed in $tmpfile
         # Existing files are in $orig_desktop_files
         for desktop_file in $orig_desktop_files; do
             if ! grep '^'$desktop_file'$' $tmpfile > /dev/null 2> /dev/null; then
                 # Keep this file, it's not in the uninstall list
                 new_desktop_files="$new_desktop_files $desktop_file"
             fi
         done
     fi
     rm -f "$tmpfile"
-    
+
     DEBUG 3 "Files to list in $menu_file: $new_desktop_files"
-    
+
     if [ -n "$new_desktop_files" ] ; then
         # Install/update
         test "${TMPDIR+set}" = set || TMPDIR=/tmp
         tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
         (
             echo '<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"'
             echo '    "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">'
             echo '<!-- Do not edit manually - generated and managed by @NAME@ -->'
             echo '<Menu>'
             echo '    <Name>Applications</Name>'
 
             for desktop_file in $directory_files; do
                 basefile=`basename "$desktop_file"`
                 basefilename=`echo "$basefile"|cut -d '.' -f 1`
                 echo "<Menu>"
                 echo "    <Name>$basefilename</Name>"
                 echo "    <Directory>$basefile</Directory>"
             done
 
             echo "    <Include>"
             for desktop_file in $new_desktop_files; do
                 echo "        <Filename>$desktop_file</Filename>"
             done
             echo "    </Include>"
 
             for desktop_file in $directory_files; do
                 echo "</Menu>"
             done
 
-            echo '</Menu>'                        
+            echo '</Menu>'
         ) > $tmpfile
         chmod $my_chmod $tmpfile
-    
+
         save_umask=`umask`
         umask $my_umask
 
         mkdir -p $xdg_dir
         eval 'cp $tmpfile $xdg_dir/$menu_file'$xdg_redirect_output
 
         umask $save_umask
         rm -f "$tmpfile"
     else
         # Uninstall
         rm -f $xdg_dir/$menu_file
     fi
-    
+
     # Uninstall .directory files only if no longer referenced
     if [ $action = "uninstall" ] ; then
         test "${TMPDIR+set}" = set || TMPDIR=/tmp
         tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
         for menu_file in $xdg_dir/*; do
             if grep 'generated and managed by @NAME@' $menu_file > /dev/null 2> /dev/null; then
                 awk '
 # List all files within <Directory> tags
 BEGIN {
   RS="<"
 }
 /^Directory/ {
   if (match($0,/>/)) {
      print substr($0,RSTART+1)
   }
 }' $menu_file >> $tmpfile
             fi
-        done 
+        done
         orig_directory_files="$directory_files"
         directory_files=
         for desktop_file in $orig_directory_files; do
             if ! grep '^'$desktop_file'$' $tmpfile > /dev/null 2> /dev/null; then
                 # No longer in use, safe to delete
                directory_files="$directory_files $desktop_file"
             fi
         done
         rm -f "$tmpfile"
     fi
@@ skipping 43 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
         ;;
 
       --novendor)
         vendor=false
         ;;
@@ skipping 92 matching lines @@
 xdg_system_dirs="$XDG_DATA_DIRS"
 [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
 xdg_global_dir=
 for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
     if [ -w $x/$xdg_dir_name ] ; then
         xdg_global_dir="$x/$xdg_dir_name"
         break
     fi
 done
 
-DEBUG 3 "Install locations for *.directory files:" 
+DEBUG 3 "Install locations for *.directory files:"
 DEBUG 3 "xdg_user_dir: $xdg_user_dir"
 DEBUG 3 "xdg_global_dir: $xdg_global_dir"
 DEBUG 3 "kde_user_dir: $kde_user_dir"
 DEBUG 3 "kde_global_dir: $kde_global_dir"
 DEBUG 3 "gnome_user_dir: $gnome_user_dir"
 DEBUG 3 "gnome_global_dir: $gnome_global_dir"
 
 if [ x"$mode" = x"user" ] ; then
     xdg_dir="$xdg_user_dir"
     kde_dir="$kde_user_dir"
@@ skipping 46 matching lines @@
 xdg_system_dirs="$XDG_DATA_DIRS"
 [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
 xdg_global_dir=
 for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
     if [ -w $x/$xdg_dir_name ] ; then
         xdg_global_dir="$x/$xdg_dir_name"
         break
     fi
 done
 
-kde_user_dir="$HOME/.kde/share/applnk"
-kde_global_dir="/usr/share/applnk"
+kde_user_dir=`kde${KDE_SESSION_VERSION}-config --path apps 2> /dev/null | cut -d ':' -f 1`
+kde_global_dir=`kde${KDE_SESSION_VERSION}-config --path apps 2> /dev/null | cut -d ':' -f 2`
 [ -w $kde_global_dir ] || kde_global_dir=
 
 gnome_user_dir="$HOME/.gnome/apps"
 gnome_global_dir="/usr/share/gnome/apps"
 [ -w $gnome_global_dir ] || gnome_global_dir=
 
-[ -f /etc/mandriva-release ] && need_mandriva_fix=true
-[ -n "$need_mandriva_fix" ] && DEBUG 1 "Fixing up .desktop categories (Mandriva work around)"
-
-DEBUG 3 "Install locations for *.desktop files:" 
+DEBUG 3 "Install locations for *.desktop files:"
 DEBUG 3 "xdg_user_dir: $xdg_user_dir"
 DEBUG 3 "xdg_global_dir: $xdg_global_dir"
 DEBUG 3 "kde_user_dir: $kde_user_dir"
 DEBUG 3 "kde_global_dir: $kde_global_dir"
 DEBUG 3 "gnome_user_dir: $gnome_user_dir"
 DEBUG 3 "gnome_global_dir: $gnome_global_dir"
 
 if [ x"$mode" = x"user" ] ; then
     xdg_dir="$xdg_user_dir"
     kde_dir="$kde_user_dir"
@@ skipping 21 matching lines @@
     case $action in
         install)
             save_umask=`umask`
             umask $my_umask
 
             for x in $xdg_dir $kde_dir $gnome_dir ; do
                 mkdir -p $x
                 eval 'cp $desktop_file $x/$basefile'$xdg_redirect_output
             done
 
-            if [ -n "$need_mandriva_fix" ] ; then
-                fixup_mandriva_categories $xdg_dir/$basefile
-            fi
-
             if [ -f $kde_dir/$basefile ] ; then
                 echo "OnlyShowIn=Old;" >> $kde_dir/$basefile
             fi
 
             if [ -f $gnome_dir/$basefile ] ; then
                 echo "OnlyShowIn=Old;" >> $gnome_dir/$basefile
             fi
-            
+
             make_lazy_default "$xdg_dir" "$basefile"
 
             umask $save_umask
             ;;
 
         uninstall)
             for x in $xdg_dir $kde_dir $gnome_dir ; do
                 rm -f $x/$basefile
             done
 
             ;;
     esac
 done
 
 if [ x"$update" = x"yes" ] ; then
     update_desktop_database
 fi
 
 exit_success