talons

commit 211b303a031cb650d77cb2aabd89d29c63a21596
parent 012ebc4ed1760110c5c7b91d3065fb49af42eaf1
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 20 Feb 2008 17:19:38 +0000

2008-02-20 [colin]	3.3.0cvs19

	* src/main.c
		Fix file attachments from older Thunar

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/main.c
 | 
3
+++

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-20 [colin]	3.3.0cvs19
+
+	* src/main.c
+		Fix file attachments from older Thunar
+
 2008-02-19 [colin]	3.3.0cvs18
 
 	* manual/plugins.xml
diff --git a/PATCHSETS b/PATCHSETS
@@ -3232,3 +3232,4 @@
 ( cvs diff -u -r 1.179.2.210 -r 1.179.2.211 src/imap.c;  cvs diff -u -r 1.115.2.187 -r 1.115.2.188 src/main.c;  cvs diff -u -r 1.204.2.161 -r 1.204.2.162 src/prefs_common.c;  cvs diff -u -r 1.103.2.104 -r 1.103.2.105 src/prefs_common.h;  cvs diff -u -r 1.1.2.44 -r 1.1.2.45 manual/advanced.xml;  ) > 3.3.0cvs16.patchset
 ( cvs diff -u -r 1.30.2.26 -r 1.30.2.27 tools/README;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/csv2addressbook.pl;  ) > 3.3.0cvs17.patchset
 ( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 manual/plugins.xml;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/es/plugins.xml;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/fr/plugins.xml;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/pl/plugins.xml;  ) > 3.3.0cvs18.patchset
+( cvs diff -u -r 1.115.2.188 -r 1.115.2.189 src/main.c;  ) > 3.3.0cvs19.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -1795,6 +1795,9 @@ static void parse_cmd_opt(int argc, char *argv[])
 				}
 			} else if (!strncmp(argv[i], "file://", 7)) {
 				cmd.target = argv[i];
+			} else if (!strncmp(argv[i], "?attach=file://", strlen("?attach=file://"))) {
+				cmd.compose = TRUE;
+				cmd.compose_mailto = argv[i];
 			} else if (strstr(argv[i], "://")) {
 				const gchar *p = argv[i];
 				if (p && *p != '\0' && *p != '-') {