Package: xdg-utils
Version: 1.1.0~rc1+git20111210-6
Severity: normal
Tags: patch

Dear Maintainer,

for some reason xdg-email falls back to a webbrowser.
I suggest using xdg-open instead which would allow for
more consistent configuration (in defaults.list) and
would also reduce duplicate code.


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (650, 'testing')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-3-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

xdg-utils depends on no packages.

Versions of packages xdg-utils recommends:
pn  libfile-mimeinfo-perl  <none>
pn  libnet-dbus-perl       <none>
pn  libx11-protocol-perl   <none>
ii  x11-utils              7.7~1
ii  x11-xserver-utils      7.7~3

Versions of packages xdg-utils suggests:
pn  gvfs-bin  <none>

-- no debconf information
--- a/scripts/xdg-email.in
+++ b/scripts/xdg-email.in
@@ -130,24 +130,13 @@
 
 open_generic()
 {
-    IFS=":"
-    for browser in $BROWSER; do
-        if [ x"$browser" != x"" ]; then
+    xdg-open "$1"
 
-            browser_with_arg=`printf "$browser" "$1" 2>/dev/null`
-            if [ $? -ne 0 ]; then browser_with_arg=$browser;
-            fi
-
-            if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
-            else $browser_with_arg;
-            fi
-
-            if [ $? -eq 0 ]; then exit_success;
-            fi
-        fi
-    done
-
-    exit_failure_operation_impossible "no method available for opening '$1'"
+    if [ $? -eq 0 ];
+        then exit_success;
+    else
+        exit_failure_operation_impossible "no method available for opening '$1'"
+    fi
 }
 
 url_encode()
@@ -335,14 +324,6 @@
     DE=envvar
 fi
 
-# if BROWSER variable is not set, check some well known browsers instead
-if [ x"$BROWSER" = x"" ]; then
-    BROWSER=www-browser:links2:elinks:links:lynx:w3m
-    if [ -n "$DISPLAY" ]; then
-        BROWSER=x-www-browser:firefox:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
-    fi
-fi
-
 case "$DE" in
     envvar)
     open_envvar "${mailto}"

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to