talons

commit d5a49f4bd101bf4f7f497099fb02539401db0918
parent 864f6ad6e078e6bb17ab5963586c0af1c0711656
Author: Michael Rasmussen <mir@datanom.net>
Date:   Sat, 27 Mar 2021 11:05:26 +0100

Merge branch 'master' into oauth2

Diffstat:
M
src/folder.c
 | 
13
+++----------

1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/folder.c b/src/folder.c
@@ -2864,7 +2864,8 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
 	MsgInfo *msginfo = data;
 	MimeInfo *mimeinfo = node->data;
 	
-	if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT
+	if ((mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT ||
+	     mimeinfo->disposition == DISPOSITIONTYPE_INLINE)
 	 && (!mimeinfo->subtype || (strcmp(mimeinfo->subtype, "pgp-signature") &&
 	     strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
 	     strcmp(mimeinfo->subtype, "pkcs7-signature")))) {
@@ -2878,15 +2879,7 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
 		    strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
 		    strcmp(mimeinfo->subtype, "pkcs7-signature")))
 			procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
-	} else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
-		 mimeinfo->id == NULL &&
-		(strcmp(mimeinfo->subtype, "pgp-signature") &&
-		 strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
-		 strcmp(mimeinfo->subtype, "pkcs7-signature")) && 
-		(procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
-		 procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
-		procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
-	} 
+	}
 
 	/* don't descend below top level message for signed and encrypted info */
 	if (mimeinfo->type == MIMETYPE_MESSAGE)