+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
( 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
*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;