talons

commit 461297bc4f9e47f5e28f01e8f7b3ee3ba211e176
parent 2c374dbcac03ca1d6f6a1cefd8c2bf2561983e51
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 12 Aug 2012 09:53:31 +0000

2012-08-12 [colin]	3.8.1cvs29

	* src/compose.c
		Make sure text/* attachments are not made
		inline, regardless of the compose mode.
		Finishes fixing bug #2203 after auto-save
		switches mode to COMPOSE_REEDIT. Thanks to
		Michael Gmelin for finding this.

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
2
+-

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-12 [colin]	3.8.1cvs29
+
+	* src/compose.c
+		Make sure text/* attachments are not made
+		inline, regardless of the compose mode.
+		Finishes fixing bug #2203 after auto-save
+		switches mode to COMPOSE_REEDIT. Thanks to
+		Michael Gmelin for finding this.
+
 2012-08-09 [colin]	3.8.1cvs28
 
 	* src/prefs_filtering.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4403,3 +4403,4 @@
 ( cvs diff -u -r 1.9.2.53 -r 1.9.2.54 src/common/ssl.c;  cvs diff -u -r 1.4.2.43 -r 1.4.2.44 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/common/ssl_certificate.h;  cvs diff -u -r 1.9.2.35 -r 1.9.2.36 src/gtk/sslcertwindow.c;  ) > 3.8.1cvs26.patchset
 ( cvs diff -u -r 1.9.2.36 -r 1.9.2.37 src/gtk/sslcertwindow.c;  ) > 3.8.1cvs27.patchset
 ( cvs diff -u -r 1.59.2.90 -r 1.59.2.91 src/prefs_filtering.c;  ) > 3.8.1cvs28.patchset
+( cvs diff -u -r 1.382.2.607 -r 1.382.2.608 src/compose.c;  ) > 3.8.1cvs29.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git 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 && compose->mode == COMPOSE_FORWARD_INLINE) {
+			if (!ainfo->name) {
 				/* Text parts with no name come from multipart/alternative
 				* forwards. Make sure the recipient won't look at the 
 				* original HTML part by mistake. */