talons

commit 16d888c77eaa4afeb28603962ebdff59c82fd6bf
parent da2e5b278414984a7ae44b5298460ada177f77de
Author: Michael Rasmussen <mir@datanom.net>
Date:   Mon, 25 Jun 2012 16:01:38 +0000

2012-06-25 [mir]	3.8.0cvs56

	* src/folder.c
	    If a folder class returns <> 0 then the message has not
	    been removed from the file system and therefore it should
	    not be removed from the cache either.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/folder.c
 | 
3
++-

4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-25 [mir]	3.8.0cvs56
+
+	* src/folder.c
+	    If a folder class returns <> 0 then the message has not
+	    been removed from the file system and therefore it should
+	    not be removed from the cache either.
+
 2012-06-20 [ticho]	3.8.0cvs55
 
 	* src/mh.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4372,3 +4372,4 @@
 ( cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/gtk/progressdialog.c;  ) > 3.8.0cvs53.patchset
 ( cvs diff -u -r 1.204.2.210 -r 1.204.2.211 src/prefs_common.c;  cvs diff -u -r 1.103.2.138 -r 1.103.2.139 src/prefs_common.h;  cvs diff -u -r 1.96.2.241 -r 1.96.2.242 src/textview.c;  cvs diff -u -r 1.12.2.31 -r 1.12.2.32 src/textview.h;  ) > 3.8.0cvs54.patchset
 ( cvs diff -u -r 1.79.2.72 -r 1.79.2.73 src/mh.c;  ) > 3.8.0cvs55.patchset
+( cvs diff -u -r 1.213.2.207 -r 1.213.2.208 src/folder.c;  ) > 3.8.0cvs56.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=55
+EXTRA_VERSION=56
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
@@ -3741,7 +3741,8 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
 
 	if (!item->folder->account || item->folder->account->imap_use_trash) {
 		if (msginfo != NULL) {
-			remove_msginfo_from_cache(item, msginfo);
+			if (ret == 0)
+				remove_msginfo_from_cache(item, msginfo);
 			procmsg_msginfo_free(msginfo);
 		}
 	}