[Commits] [SCM] claws branch, master, updated. 3.9.0-211-ga39afb2

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  a39afb26aa1b8625bad5fe7886e4e1c396fa4fb9 (commit)
       via  ac57e408a342cba99233d0dc515a5b95bea65990 (commit)
      from  83ee9ae54bfe227cff2dc17204224d2e845f8a06 (commit)


- Log -----------------------------------------------------------------
commit a39afb26aa1b8625bad5fe7886e4e1c396fa4fb9
Merge: ac57e40 83ee9ae
Author: Colin Leroy <colin at colino.net>
Date:   Fri May 3 12:58:22 2013 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit ac57e408a342cba99233d0dc515a5b95bea65990
Author: Colin Leroy <colin at colino.net>
Date:   Fri May 3 12:57:34 2013 +0200

    Avoid decoding multipart/signed parts. We'll decode their
    children, but the underlying privacy plugin expects the
    raw file.

diff --git a/src/procmime.c b/src/procmime.c
index e0c2dd1..95b326a 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -326,7 +326,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
 				: mimeinfo->encoding_type;
 	gchar lastline[BUFFSIZE];
 	memset(lastline, 0, BUFFSIZE);
-		   
+
 	cm_return_val_if_fail(mimeinfo != NULL, FALSE);
 
 	if (prefs_common.respect_flowed_format &&
@@ -349,6 +349,10 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
 	    ))
 		return TRUE;
 
+	if (mimeinfo->type == MIMETYPE_MULTIPART && 
+	    !strcasecmp(mimeinfo->subtype, "signed"))
+		return TRUE;
+
 	infp = procmime_fopen(mimeinfo->data.filename, "rb");
 	if (!infp) {
 		perror("fopen");

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

Summary of changes:
 src/procmime.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Claws Mail