[Commits] [SCM] claws branch, master, updated. 3.17.8-39-gb0cdffc33

[paul at claws-mail.org]

The branch, master has been updated
       via  b0cdffc33ff9c292c480f5c24d81d2d3eea05058 (commit)
      from  9836e8fafd5befaf2c4456e5b60560dd6366cc45 (commit)

Summary of changes:
 src/folder.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit b0cdffc33ff9c292c480f5c24d81d2d3eea05058
Author: paul <paul at claws-mail.org>
Date:   Sat Mar 27 09:42:08 2021 +0000

    also show clip icon in summaryview for inline attachments

diff --git a/src/folder.c b/src/folder.c
index 810a90375..79bbf8d85 100644
--- 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)

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


hooks/post-receive
-- 
Claws Mail