2009-10-20 [colin] 3.7.3cvs6
authorColin Leroy <colin@colino.net>
Tue, 20 Oct 2009 18:39:12 +0000 (18:39 +0000)
committerColin Leroy <colin@colino.net>
Tue, 20 Oct 2009 18:39:12 +0000 (18:39 +0000)
* src/common/utils.c
Don't g_error on normal warnings...

ChangeLog
PATCHSETS
configure.ac
src/common/utils.c

index 258b82cb87a7c1cc3f11b161d0e69c957f70fb74..4800c49544c610412d2c3b7665e1d76bef913da3 100644 (file)
--- 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
index 7fe573f9d823de35df3affe72dccdd94759c0c25..f2ed7f733e71d6456690e194315c8643638d6c16 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 7dbb0776bde5d31384a0066a34d1214ec28bec39..632f5cbcbb82d3164fac53e617ce6dc5071c2146 100644 (file)
@@ -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=
 
index d9bd6168761b2219f45ccfbab96b8ea54267b652..a3d02088d1e9f309fbb7b82556443ee9fb76c467 100644 (file)
@@ -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;