From: Colin Leroy Date: Sun, 12 Aug 2012 17:20:34 +0000 (+0000) Subject: 2012-08-12 [colin] 3.8.1cvs32 X-Git-Tag: REL_3_9_0~92 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c16092297d3da843e7be9ae168e395db16ba74dc 2012-08-12 [colin] 3.8.1cvs32 * src/compose.c Exclude text/plain from the attachment thing --- diff --git a/ChangeLog b/ChangeLog index cd2ed30f3..45531e5ce 100644 --- 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 10c08c244..b6e50fc8f 100644 --- 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 8485d264e..e925798e0 100644 --- 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 fcfe6f35c..1331ffc19 100644 --- 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. */