2004-12-09 [colin] 0.9.13cvs10.1

	* src/procmime.c
		Sync with HEAD (fix B64 encoding from memory)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index c136d3063d9ab672d40cce0d5506e4b4e1dd4bb1..da30fe50d372205fee0fc3d558af865911780a68 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-12-09 [colin]     0.9.13cvs10.1
+
+       * src/procmime.c
+               Sync with HEAD (fix B64 encoding from memory)
+
 2004-12-08 [colin]     0.9.13cvs9.1
 
        * src/gtk/colorlabel.c

diff --git a/PATCHSETS b/PATCHSETS
index d61d8a66a27aae3171c07ae2f3d3bf65dc3e7093..55a6ec4dd2b70cfd84d0309712b8fc0033238944 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -284,3 +284,4 @@
 ( cvs diff -u -r 1.22.2.4 -r 1.22.2.5 src/quote_fmt_parse.y; ) > 0.9.13cvs8.1.patchset
 ( cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/pluginwindow.c; ) > 0.9.13cvs8.2.patchset
 ( cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/gtk/colorlabel.c; ) > 0.9.13cvs9.1.patchset
+( cvs diff -u -r 1.49.2.27 -r 1.49.2.28 src/procmime.c; ) > 0.9.13cvs10.1.patchset

diff --git a/configure.ac b/configure.ac
index ad111cd581ccf6f686f4395c15c79d21e0bce42e..13cea03142b96876bf5db439f46a3a6fad272b3e 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=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/procmime.c b/src/procmime.c
index f38885d51fe9225d23cac94a080368c588a603ba..d7bc83382ac3158fecfe50cb121d95ba2e791049 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -424,17 +424,28 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                gchar *tmp_file = NULL;
 
                if (mimeinfo->type == MIMETYPE_TEXT ||
-                   mimeinfo->type == MIMETYPE_MESSAGE) {
-                       tmp_file = get_tmp_file();
-                       if (canonicalize_file(mimeinfo->data.filename, tmp_file) < 0) {
-                               g_free(tmp_file);
-                               fclose(infp);
-                       }
-                       if ((tmp_fp = fopen(tmp_file, "rb")) == NULL) {
-                               FILE_OP_ERROR(tmp_file, "fopen");
-                               unlink(tmp_file);
-                               g_free(tmp_file);
+                    mimeinfo->type == MIMETYPE_MESSAGE) {
+                       if (mimeinfo->content == MIMECONTENT_FILE) {
+                               tmp_file = get_tmp_file();
+                               if (canonicalize_file(mimeinfo->data.filename, tmp_file) < 0) {
+                                       g_free(tmp_file);
+                                       fclose(infp);
+                                       return FALSE;
+                               }
+                               if ((tmp_fp = fopen(tmp_file, "rb")) == NULL) {
+                                       FILE_OP_ERROR(tmp_file, "fopen");
+                                       unlink(tmp_file);
+                                       g_free(tmp_file);
+                                       fclose(infp);
+                                       return FALSE;
+                               }
+                       } else {
+                               gchar *out = canonicalize_str(mimeinfo->data.mem);
                                fclose(infp);
+                               infp = str_open_as_stream(out);
+                               g_free(out);
+                               if (infp == NULL)
+                                       return FALSE;
                        }
                }