talons

commit 358eb11a499435f41d49ce4a5683c6428dcac750
parent f65c20760530cbc26458c6fb8064b1074f4d381e
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 20 Oct 2009 18:39:12 +0000

2009-10-20 [colin]	3.7.3cvs6

	* src/common/utils.c
		Don't g_error on normal warnings...

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.c
 | 
4
++--

4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-20 [colin]	3.7.3cvs6
+
+	* src/common/utils.c
+		Don't g_error on normal warnings...
+
 2009-10-20 [colin]	3.7.3cvs5
 
 	* src/plugins/pgpcore/sgpgme.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3879,3 +3879,4 @@
 ( cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/exportldif.c;  cvs diff -u -r 1.12.2.21 -r 1.12.2.22 src/ldif.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/ldif.h;  ) > 3.7.3cvs3.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/common/w32lib.h;  ) > 3.7.3cvs4.patchset
 ( cvs diff -u -r 1.1.2.64 -r 1.1.2.65 src/plugins/pgpcore/sgpgme.c;  ) > 3.7.3cvs5.patchset
+( cvs diff -u -r 1.36.2.175 -r 1.36.2.176 src/common/utils.c;  ) > 3.7.3cvs6.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -1635,8 +1635,8 @@ gint scan_mailto_url(const gchar *mailto, gchar **from, gchar **to, gchar **cc, 
 			*body = decode_uri_gdup(value);
 		} else if (body && !*body && !g_ascii_strcasecmp(field, "insert")) {
 			gchar *tmp = decode_uri_gdup(value);
-			if (!g_file_get_contents(value, body, NULL, NULL)) {
-				g_error("Error: couldn't set insert file '%s' in body\n", value);
+			if (!g_file_get_contents(tmp, body, NULL, NULL)) {
+				g_warning("Error: couldn't set insert file '%s' in body\n", value);
 			}
 			g_free(tmp);
 			tmp = NULL;