2006-06-21 [paul] 2.3.1cvs6

	* src/folder.c
		Show attachment icon even if the part is 'inline'
		if the following conditions are met:
		- content-type != 'text/plain'
		- content-type != '*/pgp-signature'
		- either 'name' or 'filename' parameter is not NULL

		Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index 41d7b1b218a88e8f0f8d74cf5fd761b8993975d4..8da90658966d5bffceed015e48ce14833839c0f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-21 [paul]      2.3.1cvs6
+
+       * src/folder.c
+               Show attachment icon even if the part is 'inline'
+               if the following conditions are met:
+               - content-type != 'text/plain'
+               - content-type != '*/pgp-signature'
+               - either 'name' or 'filename' parameter is not NULL
+               
+               Thanks to Colin
+
 2006-06-21 [paul]      2.3.1cvs5
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index da549f846b391d418a6331267cdeacd1f8fab2ac..ae280efe48e13d39b1f8d24b51160670a7a293ea 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1606,3 +1606,4 @@
 ( cvs diff -u -r 1.101.2.25 -r 1.101.2.26 src/news.c;  cvs diff -u -r 1.47.2.31 -r 1.47.2.32 src/procheader.c;  cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/unmime.c;  ) > 2.3.1cvs3.patchset
 ( cvs diff -u -r 1.60.2.30 -r 1.60.2.31 po/es.po;  cvs diff -u -r 1.382.2.281 -r 1.382.2.282 src/compose.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/make.themes.project;  ) > 2.3.1cvs4.patchset
 ( cvs diff -u -r 1.94.2.88 -r 1.94.2.89 src/messageview.c;  cvs diff -u -r 1.204.2.88 -r 1.204.2.89 src/prefs_common.c;  cvs diff -u -r 1.103.2.51 -r 1.103.2.52 src/prefs_common.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_other.c;  ) > 2.3.1cvs5.patchset
+( cvs diff -u -r 1.213.2.101 -r 1.213.2.102 src/folder.c;  ) > 2.3.1cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 0317dcc932a0597fb59cea1fbc06798cd4f37ad8..d45f083f720df3f248459c6eff0b9d1676f8eef3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 8114b5165df2efd82e9084bbec31e3212aafb04f..654488e0995a631d74e8099c48633ad5e821db09 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2345,7 +2345,13 @@ void msginfo_set_mime_flags(GNode *node, gpointer data)
                if (!mimeinfo->subtype 
                ||  strcmp(mimeinfo->subtype, "pgp-signature"))
                        procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
-       }
+       } else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
+               (mimeinfo->type != MIMETYPE_TEXT || strcmp(mimeinfo->subtype, "plain")) &&
+               strcmp(mimeinfo->subtype, "pgp-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)