2004-11-05 [colin] 0.9.12cvs139.1

	* src/compose.c
	* src/procmime.c
		Sync with HEAD again ^^

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ca9a77e282d93e66a61b1f667f927bd30e3345ca..0a18c95c4832d47aa5568b3878cba6e504a89150 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-11-05 [colin]     0.9.12cvs139.1
+
+       * src/compose.c
+       * src/procmime.c
+               Sync with HEAD again ^^
+
 2004-11-05 [colin]     0.9.12cvs139.1
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index e910d54f77b0608591f03cb80a0c5829c5d378c0..e119bc60f92892b18d278cf658346feaa5ac384b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -214,3 +214,4 @@
 ( cvs diff -u -r 1.49.2.14 -r 1.49.2.15 src/procmime.c; ) > 0.9.12cvs136.2.patchset
 ( cvs diff -u -r 1.2504.2.28 -r 1.2504.2.29 ChangeLog.claws; cvs diff -u -r 1.654.2.247 -r 1.654.2.248 configure.ac; cvs diff -u -r 1.53.2.7 -r 1.53.2.8 po/POTFILES.in; cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/prefs_ext_prog.c; cvs diff -u -r 1.49.2.15 -r 1.49.2.16 src/procmime.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 tools/kdeservicemenu/README; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs138.1.patchset
 ( cvs diff -u -r 1.382.2.57 -r 1.382.2.58 src/compose.c; cvs diff -u -r 1.49.2.16 -r 1.49.2.17 src/procmime.c; ) > 0.9.12cvs139.1.patchset
+( cvs diff -u -r 1.382.2.58 -r 1.382.2.59 src/compose.c; cvs diff -u -r 1.49.2.17 -r 1.49.2.18 src/procmime.c; ) > 0.9.12cvs139.1.patchset

diff --git a/src/compose.c b/src/compose.c
index 4dfddc1f071230f2fb3874ef32569bcda843769e..56a033f8e1420c996392df4ea4a806782ce5d145 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3596,11 +3596,10 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
        mimetext->data.mem = buf;
        mimetext->type = MIMETYPE_TEXT;
        mimetext->subtype = g_strdup("plain");
-       if (encoding != ENC_UNKNOWN)
-               procmime_encode_content(mimetext, encoding);
-
        g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
                            g_strdup(out_codeset));
+       if (encoding != ENC_UNKNOWN)
+               procmime_encode_content(mimetext, encoding);
 
        /* append attachment parts */
        if (compose_use_attach(compose)) {

diff --git a/src/procmime.c b/src/procmime.c
index d28318181a92f2265d11b506cd8336c0f5363d6c..02b7f2b09563f31c7f4039ca9c5f11236f8a7496 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -369,7 +369,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
 {
        FILE *infp, *outfp;
        gint len;
-       gchar *tmpfilename, *tmpout;
+       gchar *tmpfilename;
        struct stat statbuf;
 
        if (mimeinfo->encoding_type != ENC_UNKNOWN &&
@@ -385,27 +385,15 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                return FALSE;
        }
 
-       if (mimeinfo->content == MIMECONTENT_MEM) {
-               infp = get_tmpfile_in_dir(get_mime_tmp_dir(), &tmpout);
-               if (infp)
-                       fclose(infp);
-               else
+       if (mimeinfo->content == MIMECONTENT_FILE) {
+               if ((infp = fopen(mimeinfo->data.filename, "rb")) == NULL) {
+                       g_warning("Can't open file %s\n", mimeinfo->data.filename);
                        return FALSE;
-
-               str_write_to_file(mimeinfo->data.mem, tmpout);
-               g_free(mimeinfo->data.mem);
-               mimeinfo->tmp = TRUE;
-               mimeinfo->data.filename = tmpout;
-       }
-
-       if ((infp = fopen(mimeinfo->data.filename, "rb")) == NULL) {
-               g_warning("Can't open file %s\n", mimeinfo->data.filename);
-               if (mimeinfo->content == MIMECONTENT_MEM) {
-                       unlink(mimeinfo->data.filename);
-                       g_free(mimeinfo->data.filename);
-                       mimeinfo->data.filename = NULL;
                }
-               return FALSE;
+       } else if (mimeinfo->content == MIMECONTENT_MEM) {
+               infp = str_open_as_stream(mimeinfo->data.mem);
+               if (infp == NULL)
+                       return FALSE;
        }
 
        if (encoding == ENC_BASE64) {
@@ -442,16 +430,22 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
        fclose(outfp);
        fclose(infp);
 
+       if (mimeinfo->content == MIMECONTENT_FILE) {
+               if (mimeinfo->tmp && (mimeinfo->data.filename != NULL))
+                       unlink(mimeinfo->data.filename);
+               g_free(mimeinfo->data.filename);
+       } else if (mimeinfo->content == MIMECONTENT_MEM) {
+               if (mimeinfo->tmp && (mimeinfo->data.mem != NULL))
+                       g_free(mimeinfo->data.mem);
+       }
+
        stat(tmpfilename, &statbuf);
-       if (mimeinfo->tmp && (mimeinfo->data.filename != NULL))
-               unlink(mimeinfo->data.filename);
-       g_free(mimeinfo->data.filename);
+       mimeinfo->content = MIMECONTENT_FILE;
        mimeinfo->data.filename = tmpfilename;
        mimeinfo->tmp = TRUE;
        mimeinfo->offset = 0;
        mimeinfo->length = statbuf.st_size;
        mimeinfo->encoding_type = encoding;
-       mimeinfo->content = MIMECONTENT_FILE;
 
        return TRUE;
 }