2005-10-20 [paul] 1.9.15cvs80
authorPaul Mangan <paul@claws-mail.org>
Thu, 20 Oct 2005 13:31:22 +0000 (13:31 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 20 Oct 2005 13:31:22 +0000 (13:31 +0000)
* src/folder.c
don't show clipkey icon if the only
attachment is the signature
Patch by Colin

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/folder.c

index f1e99ed..d8b527c 100644 (file)
@@ -1,3 +1,10 @@
+2005-10-20 [paul]      1.9.15cvs80
+
+       * src/folder.c
+               don't show clipkey icon if the only
+               attachment is the signature
+               Patch by Colin
+
 2005-10-20 [paul]      1.9.15cvs79
 
        * AUTHORS
index 638d85c..2836f6a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpmime/pgpmime.c;  ) > 1.9.15cvs77.patchset
 ( cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpmime/pgpmime.c;  ) > 1.9.15cvs78.patchset
 ( cvs diff -u -r 1.100.2.27 -r 1.100.2.28 AUTHORS;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/plugins/pgpmime/pgpmime.c;  ) > 1.9.15cvs79.patchset
+( cvs diff -u -r 1.213.2.65 -r 1.213.2.66 src/folder.c;  ) > 1.9.15cvs80.patchset
index 42148b5..972e393 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=79
+EXTRA_VERSION=80
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 45227f8..cb6574b 100644 (file)
@@ -2183,7 +2183,8 @@ 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->subtype ||  strcmp(mimeinfo->subtype, "pgp-signature"))) {
                procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN && 
                 mimeinfo->type != MIMETYPE_TEXT &&