From a3723a70b8bd39365a9276a15a24051c341654c2 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Tue, 29 Sep 2009 19:29:06 +0200 Subject: [PATCH] Fixes NB#141016, file with non-ASCII chars sent by Modest as attachment is not readable by Modest when received --- src/modest-tny-msg.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 90fa27e..c60af10 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -343,12 +343,19 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline "inline"); } else { const gchar *filename; + filename = tny_mime_part_get_filename (old_attachment); - if (filename) - tny_mime_part_set_filename (attachment_part, filename); - else + if (filename) { + /* If the mime part has a filename do not set it again + because Camel won't replace the old one. Instead it + will append the filename to the old one and that will + mislead email clients */ + if (!tny_mime_part_get_filename (attachment_part)) + tny_mime_part_set_filename (attachment_part, filename); + } else { tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", "attachment"); + } } if (!TNY_IS_MSG (old_attachment)) { tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64"); -- 1.7.9.5