2005-08-26 [colin] 1.9.13cvs60

	* src/procmime.c
		Previous "Problem with replies" fix brought other
		problems, fixing them

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ae2b8b98186896f26980e12d48e7de3d07bc7365..cae1fd91b4f62c438b37bd5135f4cd38f43aa6b2 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-08-26 [colin]     1.9.13cvs60
+
+       * src/procmime.c
+               Previous "Problem with replies" fix brought other
+               problems, fixing them
+
 2005-08-26 [colin]     1.9.13cvs59
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 07d82e441f0ff19110dab93447821c953eb8c2ba..26ec3f375b3b45a874e81920f8b949b584668296 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -745,3 +745,4 @@
 ( cvs diff -u -r 1.115.2.51 -r 1.115.2.52 src/main.c;  cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/common/defs.h;  ) > 1.9.13cvs57.patchset
 ( cvs diff -u -r 1.382.2.155 -r 1.382.2.156 src/compose.c;  ) > 1.9.13cvs58.patchset
 ( cvs diff -u -r 1.49.2.55 -r 1.49.2.56 src/procmime.c;  cvs diff -u -r 1.150.2.40 -r 1.150.2.41 src/procmsg.c;  cvs diff -u -r 1.382.2.156 -r 1.382.2.157 src/compose.c;  ) > 1.9.13cvs59.patchset
+( cvs diff -u -r 1.49.2.56 -r 1.49.2.57 src/procmime.c;  ) > 1.9.13cvs60.patchset

diff --git a/configure.ac b/configure.ac
index 6ea655c806cff215762dfc5b629eaed710592a18..550c35dead0eed26725136d87d4ddebe537815ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=59
+EXTRA_VERSION=60
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/procmime.c b/src/procmime.c
index 6e00efe2e83f1ebb23cfe470de0c18bdf31e9a37..8bf8f6c354c092e87b414aed923e75d079473de5 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -2141,10 +2141,6 @@ gint procmime_write_mimeinfo(MimeInfo *mimeinfo, FILE *fp)
 
        debug_print("procmime_write_mimeinfo\n");
 
-       if (mimeinfo->encoding_type == ENC_UNKNOWN
-       &&  mimeinfo->content != MIMECONTENT_EMPTY)
-               procmime_encode_content(mimeinfo, ENC_BINARY);
-
        if (G_NODE_IS_LEAF(mimeinfo->node)) {
                switch (mimeinfo->content) {
                case MIMECONTENT_FILE:
@@ -2170,8 +2166,13 @@ gint procmime_write_mimeinfo(MimeInfo *mimeinfo, FILE *fp)
                /* Call writer for mime type */
                switch (mimeinfo->type) {
                case MIMETYPE_MESSAGE:
-                       if (g_ascii_strcasecmp(mimeinfo->subtype, "rfc822") == 0)
+                       if (g_ascii_strcasecmp(mimeinfo->subtype, "rfc822") == 0) {
+                               if (mimeinfo->encoding_type == ENC_UNKNOWN
+                               &&  mimeinfo->content != MIMECONTENT_EMPTY)
+                                       procmime_encode_content(mimeinfo, ENC_BINARY);
+
                                return procmime_write_message_rfc822(mimeinfo, fp);
+                       }
                        break;
                        
                case MIMETYPE_MULTIPART: