2009-05-06 [paul] 3.7.1cvs52

	* src/folder.c
	* src/mimeview.c
		fix bug 1915, 'Mails signed with smime.p7s
		display both signed and attachment icon.'

diff --git a/ChangeLog b/ChangeLog
index e201a62684093c3f983080d3afef87f7026e1209..45c53f0e72126cc5677eaf113e02c24098a89fc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-06 [paul]      3.7.1cvs52
+
+       * src/folder.c
+       * src/mimeview.c
+               fix bug 1915, 'Mails signed with smime.p7s
+               display both signed and attachment icon.'
+

 2009-05-05 [colin]     3.7.1cvs51
 
        * src/common/utils.c
 2009-05-05 [colin]     3.7.1cvs51
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index 81f665c7f869df0b881ceab99fa54130e248fe4e..1f317d17eb415fff013149bd311a950c1a7d23b6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3791,3 +3791,4 @@
 ( cvs diff -u -r 1.16.2.67 -r 1.16.2.68 src/msgcache.c;  ) > 3.7.1cvs49.patchset
 ( cvs diff -u -r 1.36.2.169 -r 1.36.2.170 src/common/utils.c;  ) > 3.7.1cvs50.patchset
 ( cvs diff -u -r 1.36.2.170 -r 1.36.2.171 src/common/utils.c;  ) > 3.7.1cvs51.patchset
 ( cvs diff -u -r 1.16.2.67 -r 1.16.2.68 src/msgcache.c;  ) > 3.7.1cvs49.patchset
 ( cvs diff -u -r 1.36.2.169 -r 1.36.2.170 src/common/utils.c;  ) > 3.7.1cvs50.patchset
 ( cvs diff -u -r 1.36.2.170 -r 1.36.2.171 src/common/utils.c;  ) > 3.7.1cvs51.patchset

+( cvs diff -u -r 1.213.2.193 -r 1.213.2.194 src/folder.c;  cvs diff -u -r 1.83.2.154 -r 1.83.2.155 src/mimeview.c;  ) > 3.7.1cvs52.patchset

diff --git a/configure.ac b/configure.ac
index 1358548362d0457249a66e0fbb64b6ab3e376a82..c81c0b94faf7630a346515a1dfa7b867e972b508 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=51
+EXTRA_VERSION=52

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 54959bf199556a57253fda771dc9c51fe24bfe8d..15c53c5354d93befaffdc723b637003a6e60c1f0 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2714,16 +2714,22 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
        MimeInfo *mimeinfo = node->data;
        
        if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT
        MimeInfo *mimeinfo = node->data;
        
        if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT

-        && (!mimeinfo->subtype ||  strcmp(mimeinfo->subtype, "pgp-signature"))) {
+        && (!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);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN && 
                 mimeinfo->type != MIMETYPE_TEXT &&
                 mimeinfo->type != MIMETYPE_MULTIPART) {
                if (!mimeinfo->subtype 
                procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN && 
                 mimeinfo->type != MIMETYPE_TEXT &&
                 mimeinfo->type != MIMETYPE_MULTIPART) {
                if (!mimeinfo->subtype 

-               ||  strcmp(mimeinfo->subtype, "pgp-signature"))
+               || (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);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
                        procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
        } else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&

-               strcmp(mimeinfo->subtype, "pgp-signature") && 
+               (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);
                (procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
                 procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
                procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);

diff --git a/src/mimeview.c b/src/mimeview.c
index 88e29d66585b9aa5401459720d3bd13ffc4b0e1a..6c3cb3048c83fc51f7704748c2e6281442796938 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -2251,7 +2251,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:

-               if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature"))
+               if (mimeinfo->subtype && (!g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature")
+                   || !g_ascii_strcasecmp(mimeinfo->subtype, "x-pkcs7-signature")
+                   || !g_ascii_strcasecmp(mimeinfo->subtype, "pkcs7-signature")))

                        stockp = STOCK_PIXMAP_MIME_PGP_SIG;
                else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
                        stockp = STOCK_PIXMAP_MIME_PDF;
                        stockp = STOCK_PIXMAP_MIME_PGP_SIG;
                else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
                        stockp = STOCK_PIXMAP_MIME_PDF;