summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRex Dieter <rdieter@math.unl.edu>2015-04-06 09:03:18 -0500
committerRex Dieter <rdieter@math.unl.edu>2015-04-06 09:03:18 -0500
commit3e9a91b44d8d4639000fbe2b49ee303cd3f836e0 (patch)
tree329a27644373ffd41be068784c9e30df350245c7
parent236c283ec94e097986015e6f84c189a8e09e4aed (diff)
xdg-open: does not exit if it does not recognize the mimetype (BR89902)
Fixes open_generic to properly query mimetype. Can probably continue cleanup and get rid of open_generic_xdg_file_mime() open_generic_xdg_x_scheme_handler() functions altogether, but will leave that for later.
-rw-r--r--ChangeLog5
-rw-r--r--scripts/xdg-open.in3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 92775ce..7664d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
=== xdg-utils 1.1.x ===
-20`5-04-04 Rex Dieter <rdieter@fedoraproject.org>
+2015-04-06 Rex Dieter <rdieter@fedorparoject.org>
+ * xdg-open: does not exit if it does not recognize the mimetype (BR89902)
+
+2015-04-04 Rex Dieter <rdieter@fedoraproject.org>
* xdg-desktop-menu: does not support filenames with spaces (BR66605)
2015-03-23 Rex Dieter <rdieter@fedoraproject.org>
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 9964244..7629e27 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -276,7 +276,8 @@ open_generic()
file_check=${file_check%%\?*}
check_input_file "$file_check"
- open_generic_xdg_file_mime "$file"
+ filetype=`xdg-mime query filetype "$filecheck" | sed "s/;.*//"`
+ open_generic_xdg_mime "$file" "$filetype"
if which run-mailcap 2>/dev/null 1>&2; then
run-mailcap --action=view "$file"