sync with 0.9.4cvs12

diff --git a/ChangeLog b/ChangeLog
index 01aabd97078da8cf6832ce72ac73559fbb67ff5d..fd2b5822e0cdd47f3b4c0d4a59023120cb02287d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-01
+
+       * src/compose.c: compose_write_headers(): also replace ':' in the
+         MIME boundary with '_' (as a workaround for broken servers).
+
 2003-08-28
 
        * src/imap.c: imap_scan_tree_recursive(): fixed compile error.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9bd6940165aaaceefb1d671e5e00ab67ac68879d..c91a0d4f8e9c8efd736fabfde28ab180da2d340c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-09-01 [paul]      0.9.4claws48
+
+       * sync with 0.9.4cvs12
+               see ChangeLog 2003-09-01
+
 2003-08-30 [christoph] 0.9.4claws47
 
        * src/compose.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 779a331b1d4c4ec868ca5d4549dc10753698943e..888a55ffbb46f0adef3e31aeeafc3e58b21afe0b 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2003-09-01
+
+       * src/compose.c: compose_write_headers(): MIME ¶­³¦¤Î ':' ¤â '_' ¤Ë
+         ÃÖ´¹¤¹¤ë¤è¤¦¤Ë¤·¤¿(broken ¤Ê¥µ¡¼¥Ð¤Ø¤ÎÂнè¤È¤·¤Æ)¡£
+
 2003-08-28
 
        * src/imap.c: imap_scan_tree_recursive(): ¥³¥ó¥Ñ¥¤¥ë¥¨¥é¡¼¤ò½¤Àµ¡£

diff --git a/configure.ac b/configure.ac
index 3c0a17347420de7e091fa0531dba9bb38eb24d98..5adc067b75634f2c3dcaac4c12d37cf717422803 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/compose.c b/src/compose.c
index 8f02f46d1a1c9c23b73b7dde007b18f8c092471f..8ae372ffa2fcb481d3102ecd59706b73ac0d4b7e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4290,6 +4290,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
                get_rfc822_date(buf, sizeof(buf));
                subst_char(buf, ' ', '_');
                subst_char(buf, ',', '_');
+               subst_char(buf, ':', '_');
                compose->boundary = g_strdup_printf("Multipart_%s_%08x",
                                                    buf, (guint)compose);
                fprintf(fp,