Attachment 57854 Details for Bug 46814 – patch proposal

[patch] patch proposal

xdg_open.patch (text/plain), 1.61 KB, created by arno on 2012-03-01 03:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: arno

Created: 2012-03-01 03:20:06 UTC

Size: 1.61 KB

patch

obsolete

>diff --git a/scripts/xdg-open b/scripts/xdg-open
>index fee4204..509ba33 100755
>--- a/scripts/xdg-open
>+++ b/scripts/xdg-open
>@@ -422,18 +422,17 @@ open_generic()
>         if echo "$file" | grep -q '^file:///'; then
>             file=${file#file://}
>             file="$(printf "$(echo "$file" | sed -e 's@%$[a-f0-9A-F]\{2\}$@\\x\1@g')")"
>         fi
>         check_input_file "$file"
> 
>         open_generic_xdg_mime "$file"
> 
>-        if [ -f /etc/debian_version ] &&
>-            which run-mailcap 2>/dev/null 1>&2; then
>+        if 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"
>diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
>old mode 100644
>new mode 100755
>index 1ef2db9..eb4da4c
>--- a/scripts/xdg-open.in
>+++ b/scripts/xdg-open.in
>@@ -183,18 +183,17 @@ open_generic()
>         if echo "$file" | grep -q '^file:///'; then
>             file=${file#file://}
>             file="$(printf "$(echo "$file" | sed -e 's@%$[a-f0-9A-F]\{2\}$@\\x\1@g')")"
>         fi
>         check_input_file "$file"
> 
>         open_generic_xdg_file_mime "$file"
> 
>-        if [ -f /etc/debian_version ] &&
>-            which run-mailcap 2>/dev/null 1>&2; then
>+        if 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"

Actions: View | Splinter Review

Attachments on bug 46814: 57854

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.