talons

commit 4fa9e694dc0724dd70e148d4d23438a70547bbda
parent d5a49f4bd101bf4f7f497099fb02539401db0918
Author: Michael Rasmussen <mir@datanom.net>
Date:   Mon, 29 Mar 2021 17:22:47 +0200

Merge branch 'master' into oauth2

Diffstat:
M
src/file_checker.c
 | 
3
+--
M
src/file_checker.h
 | 
3
+--
M
src/folder.c
 | 
13
++++++++++---
M
tools/README
 | 
3
+--
M
tools/mairix.sh
 | 
2
+-

5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/file_checker.c b/src/file_checker.c
@@ -1,7 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2013 Paul Mangan <paul@claws-mail.org> 
- * and the Claws Mail team
+ * Copyright (C) 2013-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/file_checker.h b/src/file_checker.h
@@ -1,7 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2013 Paul Mangan <paul@claws-mail.org> 
- * and the Claws Mail team
+ * Copyright (C) 2013-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/folder.c b/src/folder.c
@@ -2864,9 +2864,8 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
 	MsgInfo *msginfo = data;
 	MimeInfo *mimeinfo = node->data;
 	
-	if ((mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT ||
-	     mimeinfo->disposition == DISPOSITIONTYPE_INLINE)
-	 && (!mimeinfo->subtype || (strcmp(mimeinfo->subtype, "pgp-signature") &&
+	if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT &&
+	    (!mimeinfo->subtype || (strcmp(mimeinfo->subtype, "pgp-signature") &&
 	     strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
 	     strcmp(mimeinfo->subtype, "pkcs7-signature")))) {
 		procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
@@ -2879,6 +2878,14 @@ 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 */
diff --git a/tools/README b/tools/README
@@ -624,8 +624,7 @@ Other tools
  WHAT IT DOES
 	It's a wrapper to mairix, a tool that makes indexed searches
 	and shows search results in a virtual folder. Maildir, MH and
-	mbox formats are supported, see:
-	http://www.rpcurnow.force9.co.uk/mairix/
+	mbox formats are supported, see: https://github.com/rc0/mairix
 
   HOW TO USE IT
 	mairix.sh
diff --git a/tools/mairix.sh b/tools/mairix.sh
@@ -19,7 +19,7 @@
 # mairix.sh		mairix wrapper for Claws Mail
 
 # if any param is passed, $1 must be the mairixrc file to use
-# if no param is passed, ~/.mairix is assumed
+# if no param is passed, ~/.mairixrc is assumed
 
 read TEXT
 test -z "$TEXT" && \