2012-08-12 [colin] 3.8.1cvs32

	* src/compose.c
		Exclude text/plain from the attachment thing

diff --git a/ChangeLog b/ChangeLog
index cd2ed30f34250fe7ec22bde308e8611f426be2da..45531e5cebdfef72a8887d573ed6223bfbce83ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-12 [colin]     3.8.1cvs32
+
+       * src/compose.c
+               Exclude text/plain from the attachment thing
+
 2012-08-12 [colin]     3.8.1cvs31
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 10c08c244b7195b2cd57f32612cbce60adbc1162..b6e50fc8f63e31caef6f96f5427e4aefcc0a9f03 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4406,3 +4406,4 @@
 ( cvs diff -u -r 1.382.2.607 -r 1.382.2.608 src/compose.c;  ) > 3.8.1cvs29.patchset
 ( cvs diff -u -r 1.94.2.235 -r 1.94.2.236 src/messageview.c;  cvs diff -u -r 1.9.2.54 -r 1.9.2.55 src/common/ssl.c;  ) > 3.8.1cvs30.patchset
 ( cvs diff -u -r 1.94.2.236 -r 1.94.2.237 src/messageview.c;  ) > 3.8.1cvs31.patchset
+( cvs diff -u -r 1.382.2.608 -r 1.382.2.609 src/compose.c;  ) > 3.8.1cvs32.patchset

diff --git a/configure.ac b/configure.ac
index 8485d264e412bad99b40676903065dfe6a838fad..e925798e01ce11c048523f0715ef904b2fac4c60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=32
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index fcfe6f35cc7d886bd3c23f1ba827dc1b377f7e4a..1331ffc19479d1a4c5dc9f73d3025703d05cd0e7 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6069,7 +6069,7 @@ static int compose_add_attachments(Compose *compose, MimeInfo *parent)
                    !g_ascii_strcasecmp(mimepart->subtype, "rfc822")) {
                        mimepart->disposition = DISPOSITIONTYPE_INLINE;
                } else if (mimepart->type == MIMETYPE_TEXT) {
-                       if (!ainfo->name) {
+                       if (!ainfo->name && g_ascii_strcasecmp(mimepart->subtype, "plain")) {
                                /* Text parts with no name come from multipart/alternative
                                * forwards. Make sure the recipient won't look at the 
                                * original HTML part by mistake. */