2009-10-21 [wwp] 3.7.3cvs7
[claws.git] / src / common / utils.c
index a3d02088d1e9f309fbb7b82556443ee9fb76c467..a16551180b0a14c19df81f996af2473bcd2f6d7c 100644 (file)
@@ -1635,8 +1635,13 @@ 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);
                        *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);
                        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;
                        }
                        g_free(tmp);
                        tmp = NULL;