[Commits] [SCM] claws branch, master, updated. 3.11.1-42-g656c173

[claws at claws-mail.org]

The branch, master has been updated
       via  656c1735cc75f73417ea1913355778bd4ecbc4fb (commit)
      from  9f4528e13ec256b719d4d9cbd1c5a836f69aee0b (commit)

Summary of changes:
 src/procmime.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 656c1735cc75f73417ea1913355778bd4ecbc4fb
Author: Paul <paul at claws-mail.org>
Date:   Mon Dec 15 21:42:25 2014 +0000

    fix bug 3351, 'Two problems when re-sending a file with an attachment' (really one problem, though)

diff --git a/src/procmime.c b/src/procmime.c
index a463026..20401d8 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -819,7 +819,7 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
 		}
 		ertf_parser_destroy(parser);
 		conv_code_converter_destroy(conv);
-	} else if (mimeinfo->type == MIMETYPE_TEXT) {
+	} else if (mimeinfo->type == MIMETYPE_TEXT && mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT) {
 		while (SC_FGETS(buf, sizeof(buf), tmpfp) != NULL) {
 			str = conv_codeset_strdup(buf, src_codeset, CS_UTF_8);
 			if (str) {

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail