talons

commit e991911756ffc176f2408a3de8e6feec05e9c5b0
parent 0f5a387e33338b142f0e17e314f10f1355610057
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 21 Jan 2011 10:46:02 +0000

2011-01-21 [colin]	3.7.8cvs41

	* src/procmime.c
		Fix bug #2050, Clawsmail sends return receipt every seconds
		We forgot to close the file when parsing
		disposition-notification fields, which made unlinking of the
		corresponding emails in tempfolder/processing impossible in
		Windows. Causing them to be re-fetched every time.

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/procmime.c
 | 
4
+++-

4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-21 [colin]	3.7.8cvs41
+
+	* src/procmime.c
+		Fix bug #2050, Clawsmail sends return receipt every seconds
+		We forgot to close the file when parsing 
+		disposition-notification fields, which made unlinking of the
+		corresponding emails in tempfolder/processing impossible in
+		Windows. Causing them to be re-fetched every time.
+
 2011-01-21 [colin]	3.7.8cvs40
 
 	* claws-mail.desktop
diff --git a/PATCHSETS b/PATCHSETS
@@ -4114,3 +4114,4 @@
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 claws-mail.desktop;  ) > 3.7.8cvs38.patchset
 ( cvs diff -u -r 1.18.2.63 -r 1.18.2.64 src/plugins/spamassassin/spamassassin.c;  ) > 3.7.8cvs39.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 claws-mail.desktop;  ) > 3.7.8cvs40.patchset
+( cvs diff -u -r 1.49.2.136 -r 1.49.2.137 src/procmime.c;  ) > 3.7.8cvs41.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/procmime.c b/src/procmime.c
@@ -1464,8 +1464,10 @@ static void procmime_parse_disposition_notification(MimeInfo *mimeinfo,
 	} else {
 		procheader_get_header_fields(fp, hentry);
 	}
+    
+        fclose(fp);
 
-	if (!hentry[0].body || !hentry[1].body) {
+    	if (!hentry[0].body || !hentry[1].body) {
 		debug_print("MsgId %s, Disp %s\n",
 			hentry[0].body ? hentry[0].body:"(nil)",
 			hentry[1].body ? hentry[1].body:"(nil)");