From f16c56af769c323e4c3622565c45603fa588fe48 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 29 Aug 2006 06:06:19 +0000 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5c619d27..fa5c90cd8 100644 --- 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 diff --git a/PATCHSETS b/PATCHSETS index a1a3f1354..3cc7f547c 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1798,3 +1798,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index 359cebfa7..fdd4795f3 100644 --- a/configure.ac +++ b/configure.ac @@ -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= diff --git a/src/folder.c b/src/folder.c index a55dcace5..cc2e53d65 100644 --- a/src/folder.c +++ b/src/folder.c @@ -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, -- 2.25.1