From: Colin Leroy <colin@colino.net>
Date: Fri, 5 Oct 2007 17:00:24 +0000 (+0000)
Subject: 2007-10-05 [colin]	3.0.2cvs15
X-Git-Tag: rel_3_1_0~146
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4ea94009587be61ed954aafb2eed69c2ace2a235;hp=8ecdac668b1353dcb515b04fcb54e5b843fa57d4

2007-10-05 [colin]	3.0.2cvs15

	* src/etpan/imap-thread.c
		Fix wrong error codepath
---

diff --git a/ChangeLog b/ChangeLog
index e79a8d715..8b2bb41ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-05 [colin]	3.0.2cvs15
+
+	* src/etpan/imap-thread.c
+		Fix wrong error codepath
+
 2007-10-05 [wwp]	3.0.2cvs14
 
 	* src/filtering.c
diff --git a/PATCHSETS b/PATCHSETS
index eb48e30b0..6be3c280d 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2927,3 +2927,4 @@
 ( cvs diff -u -r 1.654.2.2980 -r 1.654.2.2981 configure.ac;  cvs diff -u -r 1.155.2.76 -r 1.155.2.77 src/Makefile.am;  ) > 3.0.2cvs12.patchset
 ( cvs diff -u -r 1.60.2.51 -r 1.60.2.52 src/prefs_actions.c;  cvs diff -u -r 1.59.2.58 -r 1.59.2.59 src/prefs_filtering.c;  cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/prefs_template.c;  ) > 3.0.2cvs13.patchset
 ( cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/filtering.c;  ) > 3.0.2cvs14.patchset
+( cvs diff -u -r 1.1.4.86 -r 1.1.4.87 src/etpan/imap-thread.c;  ) > 3.0.2cvs15.patchset
diff --git a/configure.ac b/configure.ac
index 0957b21d0..ea7ca9c51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index bafd2d1e9..dd95a57f2 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -2276,8 +2276,7 @@ static void fetch_content_run(struct etpan_thread_op * op)
 		
 		r = fclose(f);
 		if (r == EOF) {
-			g_unlink(param->filename);
-			goto close;
+			goto unlink;
 		}
 		goto free;