From: Colin Leroy <colin@colino.net>
Date: Wed, 10 Aug 2005 16:31:42 +0000 (+0000)
Subject: 2005-08-10 [colin]	1.9.13cvs32
X-Git-Tag: rel_1_9_14~55
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=3925e8d8a38833f11380d59c78870f8e24ea3ec6

2005-08-10 [colin]	1.9.13cvs32

	* src/procmsg.c
		Fix cvs31 (missing fclose before reading
		the file)
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index e6be0e7cb..61b91a778 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-08-10 [colin]	1.9.13cvs32
+
+	* src/procmsg.c
+		Fix cvs31 (missing fclose before reading
+		the file)
+
 2005-08-10 [colin]	1.9.13cvs31
 
 	* src/procmsg.c
diff --git a/PATCHSETS b/PATCHSETS
index 346417c2f..5b63ace47 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -717,3 +717,4 @@
 ( cvs diff -u -r 1.213.2.49 -r 1.213.2.50 src/folder.c;  cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/folderutils.c;  cvs diff -u -r 1.207.2.55 -r 1.207.2.56 src/folderview.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/imap_gtk.c;  cvs diff -u -r 1.274.2.53 -r 1.274.2.54 src/mainwindow.c;  cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/mh_gtk.c;  cvs diff -u -r 1.150.2.34 -r 1.150.2.35 src/procmsg.c;  cvs diff -u -r 1.395.2.109 -r 1.395.2.110 src/summaryview.c;  ) > 1.9.13cvs29.patchset
 ( cvs diff -u -r 1.274.2.54 -r 1.274.2.55 src/mainwindow.c;  ) > 1.9.13cvs30.patchset
 ( cvs diff -u -r 1.150.2.35 -r 1.150.2.36 src/procmsg.c;  ) > 1.9.13cvs31.patchset
+( cvs diff -u -r 1.150.2.36 -r 1.150.2.37 src/procmsg.c;  ) > 1.9.13cvs32.patchset
diff --git a/configure.ac b/configure.ac
index ae602757e..d1de90f66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=32
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/procmsg.c b/src/procmsg.c
index 16ff84132..b19098f94 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1878,7 +1878,8 @@ MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimei
 		g_warning("procmsg_msginfo_new_from_mimeinfo(): unsuitable mimeinfo");
 		return NULL;
 	}
-		    
+	
+	
 	if (mimeinfo->content == MIMECONTENT_MEM) {
 		gchar *tmpfile = get_tmp_file();
 		str_write_to_file(mimeinfo->data.mem, tmpfile);
@@ -1897,12 +1898,17 @@ MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimei
 	} else {
 		gchar *tmpfile = get_tmp_file();
 		FILE *fp = fopen(tmpfile, "wb");
-		if (fp && procmime_write_message_rfc822(mimeinfo, fp) >= 0) {
+		if (fp && procmime_write_mimeinfo(mimeinfo, fp) >= 0) {
+			if (fp)
+				fclose(fp);
+			fp = NULL;
 			tmp_msginfo = procheader_parse_file(
-				tmpfile, flags, TRUE, FALSE);
+				tmpfile, flags, 
+				TRUE, FALSE);
 		}
 		if (fp)
 			fclose(fp);
+
 		if (tmp_msginfo != NULL) {
 			tmp_msginfo->folder = src_msginfo->folder;
 			tmp_msginfo->plaintext_file = g_strdup(tmpfile);