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

third_party/xdg-utils/scripts/xdg-open

-#!/bin/bash
+#!/bin/sh
 #---------------------------------------------
 #   xdg-open
 #
 #   Utility script to open a URL in the registered default application.
 #
 #   Refer to the usage() function below for usage.
 #
 #   Copyright 2006, Kevin Krammer <kevin.krammer@gmx.at>
 #   Copyright 2006, Jeremy White <jwhite@codeweavers.com>
 #
@@ skipping 181 matching lines @@
 exit_failure_file_permission_read()
 {
     if [ $# -gt 0 ]; then
         echo "xdg-open: $@" >&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-open: $@" >&2
     fi
 
     exit 6
 }
 
@@ skipping 56 matching lines @@
             echo "Use 'man xdg-open' or 'xdg-open --manual' for additional info."
             exit_success
             ;;
 
             --manual)
             manualpage
             exit_success
             ;;
 
             --version)
-            echo "xdg-open 1.0.1"
+            echo "xdg-open 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
 }
 
+# This handles backslashes but not quote marks.
+first_word()
+{
+    read first rest
+    echo "$first"
+}
+
 open_kde()
 {
-    kfmclient exec "$1"
-    kfmclient_fix_exit_code $?
+    if kde-open -v 2>/dev/null 1>&2; then
+        kde-open "$1"
+    else
+        if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
+            kfmclient openURL "$1"
+        else
+            kfmclient exec "$1"
+            kfmclient_fix_exit_code $?
+        fi
+    fi
 
     if [ $? -eq 0 ]; then
         exit_success
     else
         exit_failure_operation_failed
     fi
 }
 
 open_gnome()
 {
-    gnome-open "$1"
+    if gvfs-open --help 2>/dev/null 1>&2; then
+        gvfs-open "$1"
+    else
+        gnome-open "$1"
+    fi
 
     if [ $? -eq 0 ]; then
         exit_success
     else
         exit_failure_operation_failed
     fi
 }
 
 open_xfce()
 {
     exo-open "$1"
 
     if [ $? -eq 0 ]; then
         exit_success
     else
         exit_failure_operation_failed
     fi
 }
 
+open_generic_xdg_mime()
+{
+    filetype=`xdg-mime query filetype "$1" | sed "s/;.*//"`
+    default=`xdg-mime query default "$filetype"`
+    if [ -n "$default" ] ; then
+        xdg_user_dir="$XDG_DATA_HOME"
+        [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
+
+        xdg_system_dirs="$XDG_DATA_DIRS"
+        [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
+
+        for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
+            file="$x/applications/$default"
+            if [ -r "$file" ] ; then
+                command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
+                command_exec=`which $command 2>/dev/null`
+                if [ -x "$command_exec" ] ; then
+                    $command_exec "$1"
+                    if [ $? -eq 0 ]; then
+                        exit_success
+                    fi
+                fi
+            fi
+        done
+    fi
+}
+
 open_generic()
 {
-    if mimeopen -v 2>/dev/null 1>&2; then
-        mimeopen -n "$1"
-        if [ $? -eq 0 ]; then
-            exit_success
-        fi
-    fi
-
-    if which run-mailcap 2>/dev/null 1>&2 &&
-       (echo "$1" | grep -q '^file://' ||
+    # Paths or file:// URLs
+    if (echo "$1" | grep -q '^file://' ||
         ! echo "$1" | egrep -q '^[a-zA-Z+\.\-]+:'); then
 
         local file=$(echo "$1" | sed 's%^file://%%')
-        run-mailcap --action=view "$file"
-        if [ $? -eq 0 ]; then
-            exit_success
+
+        # Decode URLs
+        # TODO
+
+        check_input_file "$file"
+
+        open_generic_xdg_mime "$file"
+
+        if [ -f /etc/debian_version ] &&
+            which run-mailcap 2>/dev/null 1>&2; then
+            run-mailcap --action=view "$file"
+            if [ $? -eq 0 ]; then
+                exit_success
+            fi
+        fi
+
+        if mimeopen -v 2>/dev/null 1>&2; then
+            mimeopen -L -n "$file"
+            if [ $? -eq 0 ]; then
+                exit_success
+            fi
         fi
     fi
 
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then
 
-            IFS=' '
-            browser_with_arg=${browser//'%s'/"$1"}
-
-            if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
-            else $browser_with_arg;
+            browser_with_arg=`printf "$browser" "$1" 2>/dev/null`
+            if [ $? -ne 0 ]; then
+                browser_with_arg=$browser;
             fi
 
-            if [ $? -eq 0 ]; then exit_success;
+            if [ x"$browser_with_arg" = x"$browser" ]; then
+                "$browser" "$1";
+            else eval '$browser_with_arg'$xdg_redirect_output;
+            fi
+
+            if [ $? -eq 0 ]; then
+                exit_success;
             fi
         fi
     done
 
     exit_failure_operation_impossible "no method available for opening '$1'"
 }
 
 [ x"$1" != x"" ] || exit_failure_syntax
 
 url=
@@ skipping 15 matching lines @@
     esac
 done
 
 if [ -z "${url}" ] ; then
     exit_failure_syntax "file or URL argument missing"
 fi
 
 detectDE
 
 if [ x"$DE" = x"" ]; then
-    # if BROWSER variable is not set, check some well known browsers instead
-    if [ x"$BROWSER" = x"" ]; then
-        BROWSER=firefox:mozilla:netscape
+    DE=generic
+fi
+
+# if BROWSER variable is not set, check some well known browsers instead
+if [ x"$BROWSER" = x"" ]; then
+    BROWSER=links2:links:lynx:w3m
+    if [ -n "$DISPLAY" ]; then
+        BROWSER=firefox:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
     fi
-    DE=generic
 fi
 
 case "$DE" in
     kde)
     open_kde "$url"
     ;;
 
     gnome)
     open_gnome "$url"
     ;;
 
     xfce)
     open_xfce "$url"
     ;;
 
     generic)
     open_generic "$url"
     ;;
 
     *)
     exit_failure_operation_impossible "no method available for opening '$url'"
     ;;
 esac