xdg-mime: search mimeinfo.cache in $xdg_user_dir too (BR31629)

2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7664d5d..d1110a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 === xdg-utils 1.1.x ===
 
+2015-04-13 Rex Dieter <rdieter@fedoraproject.org>
+   * xdg-mime: search mimeinfo.cache in $xdg_user_dir too (BR31629)
+
 2015-04-06 Rex Dieter <rdieter@fedorparoject.org>
    * xdg-open: does not exit if it does not recognize the mimetype (BR89902)
 
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
index 74cadfa..f9165ea 100644
--- a/scripts/xdg-mime.in
+++ b/scripts/xdg-mime.in
@@ -380,7 +380,7 @@ defapp_generic()
         fi
     done
 
-    for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do
+    for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
        for prefix in "$XDG_MENU_PREFIX" ""; do
           DEBUG 2 "Checking $x/applications/${prefix}defaults.list and $x/applications/${prefix}mimeinfo.cache"
           trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | head -n 1 | cut -d '=' -f 2 | cut -d ';' -f 1`