sync with sylpheed 0.7.2cvs21

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 1cf3c818d398f4f55f3a2958eff7c1e1d55fb01d..dcb199c2e9901001a5324716128fa3414bfe45be 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2963,11 +2963,20 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
 
                buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
                if (!buf) {
 
                buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
                if (!buf) {

-                       g_free(chars);
-                       fclose(fp);
-                       unlink(file);
-                       alertpanel_error(_("Can't convert the codeset of the message."));
-                       return -1;
+                       AlertValue aval;
+
+                       aval = alertpanel
+                               (_("Error"),
+                                _("Can't convert the character encoding of the message.\n"
+                                  "Send it anyway?"), _("Yes"), _("+No"), NULL);
+                       if (aval != G_ALERTDEFAULT) {
+                               g_free(chars);
+                               fclose(fp);
+                               unlink(file);
+                               return -1;
+                       } else {
+                               buf = g_strdup(chars);
+                       }

                }
        }
        g_free(chars);
                }
        }
        g_free(chars);