2006-08-29 [colin] 2.4.0cvs107
authorColin Leroy <colin@colino.net>
Tue, 29 Aug 2006 06:06:19 +0000 (06:06 +0000)
committerColin Leroy <colin@colino.net>
Tue, 29 Aug 2006 06:06:19 +0000 (06:06 +0000)
* src/folder.c
Fix data loss when copy fails during a move:
only use fast remove_msgs if everything was
copied OK; else use slow remove_msg on the
mails that got copied only.

ChangeLog
PATCHSETS
configure.ac
src/folder.c

index c5c619d..fa5c90c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-29 [colin]     2.4.0cvs107
+
+       * src/folder.c
+               Fix data loss when copy fails during a move:
+               only use fast remove_msgs if everything was
+               copied OK; else use slow remove_msg on the
+               mails that got copied only.
+
 2006-08-28 [paul]      2.4.0cvs106
 
        * src/mh.c
index a1a3f13..3cc7f54 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.79.2.39 -r 1.79.2.40 src/mh.c;  cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/prefs_spelling.c;  cvs diff -u -r 1.5.2.34 -r 1.5.2.35 src/gtk/pluginwindow.c;  ) > 2.4.0cvs104.patchset
 ( cvs diff -u -r 1.18.2.37 -r 1.18.2.38 src/plugins/spamassassin/spamassassin.c;  ) > 2.4.0cvs105.patchset
 ( cvs diff -u -r 1.79.2.40 -r 1.79.2.41 src/mh.c;  ) > 2.4.0cvs106.patchset
+( cvs diff -u -r 1.213.2.110 -r 1.213.2.111 src/folder.c;  ) > 2.4.0cvs107.patchset
index 359cebf..fdd4795 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=106
+EXTRA_VERSION=107
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a55dcac..cc2e53d 100644 (file)
@@ -3012,7 +3012,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 * copying was successfull and update folder
                 * message counts
                 */
-               if (item->folder->klass->remove_msgs) {
+               if (not_moved == NULL && item->folder->klass->remove_msgs) {
                        item->folder->klass->remove_msgs(item->folder,
                                                                msginfo->folder,
                                                                msglist,