Package: claws-mail
Version: 3.7.1-2
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu karmic ubuntu-patch

Hello,

I noticed that claws always opens in Epiphany regardless of what the
user has selected as their default browser (in GNOME, not sure what
happens in other DEs). This is because of the patch to always use
x-www-browser, which doesn't DTRT WRT user selected defaults. The patch
that I'm attaching (which I uploaded to Ubuntu Karmic too) switches to
use xdg-open which does do the correct thing and will work across DEs
too.

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/09use_xdg_open.patch: Switch to using xdg-open instead of
    x-www-browser as this respects the user's choice of default browser.

Please consider applying it on your next upload.

Regards,
Iain

-- System Information:
Debian Release: squeeze/sid
  APT prefers karmic-updates
  APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 
'karmic-proposed'), (500, 'karmic-backports'), (500, 'karmic')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-9-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u claws-mail-3.7.1/debian/control claws-mail-3.7.1/debian/control
--- claws-mail-3.7.1/debian/control
+++ claws-mail-3.7.1/debian/control
@@ -11,7 +11,7 @@
  libenchant-dev, libreadline5-dev, libt1-dev, 
  libgnomeprintui2.2-dev, libetpan-dev (>= 0.57), 
  network-manager-dev (>= 0.6.2), libdbus-glib-1-dev (>= 0.74),
- xsltproc, docbook-xsl, docbook-xml
+ xsltproc, docbook-xsl, docbook-xml, xdg-utils
 Standards-Version: 3.8.1
 
 Package: claws-mail
reverted:
--- claws-mail-3.7.1/debian/patches/09use_x_www_browser.patch
+++ claws-mail-3.7.1.orig/debian/patches/09use_x_www_browser.patch
@@ -1,12 +0,0 @@
-diff -urN claws-mail-2.10.0-rc1.orig/src/common/defs.h claws-mail-2.10.0-rc1/src/common/defs.h
---- claws-mail-2.10.0-rc1.orig/src/common/defs.h	2007-06-15 10:38:56.000000000 +0200
-+++ claws-mail-2.10.0-rc1/src/common/defs.h	2007-06-29 09:53:49.000000000 +0200
-@@ -118,7 +118,7 @@
- /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
- /* #define DEFAULT_INC_PROGRAM	"imget" */
- #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
--#define DEFAULT_BROWSER_CMD	"firefox '%s'"
-+#define DEFAULT_BROWSER_CMD	"x-www-browser '%s'"
- #ifndef MAEMO
- #define DEFAULT_EDITOR_CMD	"gedit '%s'"
- #else
diff -u claws-mail-3.7.1/debian/patches/series claws-mail-3.7.1/debian/patches/series
--- claws-mail-3.7.1/debian/patches/series
+++ claws-mail-3.7.1/debian/patches/series
@@ -1,4 +1,4 @@
-09use_x_www_browser.patch
+09use_xdg_open.patch
 11mark_trashed_as_read.patch
 12fix_manpage_header.patch
 50disable_can_change_accels_by_default
only in patch2:
unchanged:
--- claws-mail-3.7.1.orig/debian/patches/09use_xdg_open.patch
+++ claws-mail-3.7.1/debian/patches/09use_xdg_open.patch
@@ -0,0 +1,12 @@
+diff -urN claws-mail-2.10.0-rc1.orig/src/common/defs.h claws-mail-2.10.0-rc1/src/common/defs.h
+--- claws-mail-2.10.0-rc1.orig/src/common/defs.h	2007-06-15 10:38:56.000000000 +0200
++++ claws-mail-2.10.0-rc1/src/common/defs.h	2007-06-29 09:53:49.000000000 +0200
+@@ -118,7 +118,7 @@
+ /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
+ /* #define DEFAULT_INC_PROGRAM	"imget" */
+ #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
+-#define DEFAULT_BROWSER_CMD	"firefox '%s'"
++#define DEFAULT_BROWSER_CMD	"xdg-open '%s'"
+ #ifndef MAEMO
+ #define DEFAULT_EDITOR_CMD	"gedit '%s'"
+ #else

Reply via email to