2009-10-21 [wwp] 3.7.3cvs8

	* src/common/utils.c
		Fix 3.7.3cvs7 (accidentally committed a CVS conflict mark, say bravo).

diff --git a/ChangeLog b/ChangeLog
index 16dc685..d4ba6e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-21 [wwp]       3.7.3cvs8
+
+       * src/common/utils.c
+               Fix 3.7.3cvs7 (accidentally committed a CVS conflict mark, say bravo).
+
 2009-10-21 [wwp]       3.7.3cvs7
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index 3a11744..05c0c96 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3881,3 +3881,4 @@
 ( 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
 ( cvs diff -u -r 1.36.2.176 -r 1.36.2.177 src/common/utils.c;  ) > 3.7.3cvs7.patchset
+( cvs diff -u -r 1.36.2.177 -r 1.36.2.178 src/common/utils.c;  ) > 3.7.3cvs8.patchset

diff --git a/configure.ac b/configure.ac
index bb47e83..1d75c5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index a165511..a3d0208 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1635,13 +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);
-<<<<<<< utils.c
-                       if (!g_file_get_contents(value, body, NULL, NULL)) {
-                               g_warning("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);
->>>>>>> 1.36.2.176
                        }
                        g_free(tmp);
                        tmp = NULL;