sync with 0.9.3cvs1

diff --git a/ChangeLog b/ChangeLog
index 0832bcf0f81f919c9987c293cd286881fde9f366..69ff2dd00348335452e0c526b1bf5a7dcbda1e51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-07
+
+       * src/compose.c: add 'Content-Disposition: inline' to a text/plain
+         part when using PGP/MIME signing.
+
 2003-07-04
 
        * version 0.9.3

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 205657c8a2e1a96bdb5be293edb9e456f67624be..e752918fbcdec3529151f020e5f35b900112fba0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-07-07 [paul]      0.9.0claws85
+
+       * sync with 0.9.3cvs1
+               see ChangeLog 2003-07-07
+
 2003-07-05 [christoph] 0.9.0claws84
 
        * src/Makefile.am

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 02046da5483a593dd6ffdada1ceed6218669a60d..e6ffb453cb86e683b82877defb7760f929a118fa 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2003-07-07
+
+       * src/compose.c: PGP/MIME ½ð̾¤ò»ÈÍѤ¹¤ë¤È¤­¤Ï text/plain ¥Ñ¡¼¥È¤Ë
+         'Content-Disposition: inline' ¤òÉղá£
+
 2003-07-04
 
        * version 0.9.3

diff --git a/configure.ac b/configure.ac
index 502a4918c79995d42ec86e7df0f1ee9b8e6bb00b..6494daf573992cd0aeec8b5b9d4b09db1abd015f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws84
+EXTRA_VERSION=claws85
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 380c0db6f9e498f5565841b212fb1f925e7c9d47..969d75ad5bd793888098cd1097cb281a388a8cbc 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3484,6 +3484,10 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
                fprintf(fp, "\n--%s\n", compose->boundary);
                fprintf(fp, "Content-Type: text/plain; charset=%s\n",
                        out_codeset);
+#if USE_GPGME
+               if (compose->use_signing && !compose->gnupg_mode)
+                       fprintf(fp, "Content-Disposition: inline\n");
+#endif
                fprintf(fp, "Content-Transfer-Encoding: %s\n",
                        procmime_get_encoding_str(encoding));
                fputc('\n', fp);