--- OLD/scripts/xdg-open.in	2013-08-28 13:03:47.099270687 +0000

+++ NEW/scripts/xdg-open.in	2013-08-28 13:04:32.510133096 +0000

@@ -527,18 +527,27 @@

     fi

 }

+generic_mime_apps() {

+    local mimeapps

+    local d

+    for d in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do

+        mimeapps="$d/applications/mimeapps.list"

+	test -r "$mimeapps" || continue

+	sed -n "\|$1|{s/.*=//;s/;/\n/gp}" < "$mimeapps"

+    done

+}

+

 open_generic_xdg_mime()

 {

     filetype="$2"

-    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/

+    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/

 DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"

+

+    for default in `xdg-mime query default "$filetype"` `generic_mime_apps "$filetype"`; do

         for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do

             local file

             # look for both vendor-app.desktop, vendor/app.desktop

@@ -566,7 +575,7 @@

                 fi

             fi

         done

-    fi

+    done

 }

 open_generic_xdg_file_mime()