2005-01-28 [colin] 1.0.0cvs23.1

	* src/folderview.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index e242a07cc6621181058686236716a8882d1e2537..057e9e5b80b550dbf2b5b17283a780975edc7f1c 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-01-28 [colin]     1.0.0cvs23.1
+
+       * src/folderview.c
+               Sync with HEAD
+

 2005-01-27 [colin]     1.0.0cvs21.1
 
        * src/folder.c
 2005-01-27 [colin]     1.0.0cvs21.1
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 985dd9f2877119d311e9c5fa34035f5eba6a4f3e..49d2d16016b90f6fad347b93fe396fcfbb17e44b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -348,3 +348,4 @@
 ( cvs diff -u -r 1.94.2.38 -r 1.94.2.39 src/messageview.c; cvs diff -u -r 1.395.2.47 -r 1.395.2.48 src/summaryview.c; cvs diff -u -r 1.274.2.27 -r 1.274.2.28 src/mainwindow.c; cvs diff -u -r 1.382.2.88 -r 1.382.2.89 src/compose.c; cvs diff -u -r 1.50.2.6 -r 1.50.2.7 src/compose.h; cvs diff -u -r 1.150.2.18 -r 1.150.2.19 src/procmsg.c; cvs diff -u -r 1.60.2.9 -r 1.60.2.10 src/procmsg.h; cvs diff -u -r 1.43.2.12 -r 1.43.2.13 src/toolbar.c; ) > 1.0.0cvs18.1.patchset
 ( cvs diff -u -r 1.49.2.29 -r 1.49.2.30 src/procmime.c; ) > 1.0.0cvs19.1.patchset
 ( cvs diff -u -r 1.213.2.22 -r 1.213.2.23 src/folder.c; cvs diff -u -r 1.207.2.26 -r 1.207.2.27 src/folderview.c; ) > 1.0.0cvs21.1.patchset
 ( cvs diff -u -r 1.94.2.38 -r 1.94.2.39 src/messageview.c; cvs diff -u -r 1.395.2.47 -r 1.395.2.48 src/summaryview.c; cvs diff -u -r 1.274.2.27 -r 1.274.2.28 src/mainwindow.c; cvs diff -u -r 1.382.2.88 -r 1.382.2.89 src/compose.c; cvs diff -u -r 1.50.2.6 -r 1.50.2.7 src/compose.h; cvs diff -u -r 1.150.2.18 -r 1.150.2.19 src/procmsg.c; cvs diff -u -r 1.60.2.9 -r 1.60.2.10 src/procmsg.h; cvs diff -u -r 1.43.2.12 -r 1.43.2.13 src/toolbar.c; ) > 1.0.0cvs18.1.patchset
 ( cvs diff -u -r 1.49.2.29 -r 1.49.2.30 src/procmime.c; ) > 1.0.0cvs19.1.patchset
 ( cvs diff -u -r 1.213.2.22 -r 1.213.2.23 src/folder.c; cvs diff -u -r 1.207.2.26 -r 1.207.2.27 src/folderview.c; ) > 1.0.0cvs21.1.patchset

+( cvs diff -u -r 1.207.2.27 -r 1.207.2.28 src/folderview.c; ) > 1.0.0cvs23.1.patchset

diff --git a/configure.ac b/configure.ac
index 79db8c82a85c88f2eb4ccc6bdd61837402177d0b..6ccfd7673165e4af2d35bff6ee3b1e416539dd03 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=21
+EXTRA_VERSION=23

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/folderview.c b/src/folderview.c
index 1511597973a07277ce1b7aecaf36e27b9fb84b13..ab3a5534a62b7ce6ba096abd09dc9a5adc8d4798 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1807,7 +1807,10 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo = (MsgInfo *) cur->data;
        
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo = (MsgInfo *) cur->data;

-               partial_mark_for_delete(msginfo);
+               /* is it partially received? (partial_recv isn't cached) */
+               if (msginfo->total_size != 0 && 
+                   msginfo->size != (off_t)msginfo->total_size)
+                       partial_mark_for_delete(msginfo);

        }
        procmsg_msg_list_free(mlist);
 
        }
        procmsg_msg_list_free(mlist);