aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--filter/ChangeLog3
-rw-r--r--filter/filter-driver.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 19609707bb..4e67a7a22f 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -3,10 +3,11 @@
* filter-driver.c (filter_driver_filter_message): If there is a
default folder and the message hasn't been deleted then... should
be: If there is a default folder and the message hasn't been
- copied to another folder...
+ copied to another folder and the message hasn't been deleted...
(filter_driver_filter_message): Make it so that the FILTER_LOG_END
is only called if filtered were applied to the message so we don't
get huge gaps of whitespace in the log file.
+ (filter_driver_filter_message):
2000-11-10 Christopher James Lahey <clahey@helixcode.com>
diff --git a/filter/filter-driver.c b/filter/filter-driver.c
index 48e95f9877..cf73bb050c 100644
--- a/filter/filter-driver.c
+++ b/filter/filter-driver.c
@@ -785,7 +785,7 @@ filter_driver_filter_message (FilterDriver *driver, CamelMimeMessage *message, C
g_string_free (fsearch, TRUE);
g_string_free (faction, TRUE);
- if (p->defaultfolder && !p->copied) {
+ if (p->defaultfolder && !p->copied && !p->deleted) {
/* copy it to the default inbox */
filtered = TRUE;
filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to default folder");