sync with 0.9.3cvs1

diff --git a/ChangeLog b/ChangeLog
index 0832bcf..69ff2dd 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 205657c..e752918 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 02046da..e6ffb45 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 502a491..6494daf 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 380c0db..969d75a 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);