aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog3
-rw-r--r--camel/camel-filter-driver.c17
2 files changed, 12 insertions, 8 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index e83fcc93c5..20da6bff90 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -4,6 +4,9 @@
Okay, I've decided that that user is just on crack. We don't want
to allow filtering of deleted messages or we could get some
unexpected behavior.
+ (do_move): Oops. My last fix needs to be after the if-statement,
+ not inside it.
+ (do_copy): And here too.
2001-07-12 Jeffrey Stedfast <fejj@ximian.com>
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index adda54e27d..6ecc4bffc0 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -374,13 +374,13 @@ do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriv
uids = g_ptr_array_new ();
g_ptr_array_add (uids, (char *) p->uid);
camel_folder_copy_messages_to (p->source, uids, outbox, p->ex);
- if (!camel_exception_is_set (p->ex))
- p->copied = TRUE;
-
g_ptr_array_free (uids, TRUE);
} else
camel_folder_append_message (outbox, p->message, p->info, p->ex);
+ if (!camel_exception_is_set (p->ex))
+ p->copied = TRUE;
+
camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to folder %s",
folder);
}
@@ -413,15 +413,16 @@ do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriv
uids = g_ptr_array_new ();
g_ptr_array_add (uids, (char *) p->uid);
camel_folder_copy_messages_to (p->source, uids, outbox, p->ex);
- if (!camel_exception_is_set (p->ex)) {
- /* a 'move' is a copy & delete */
- p->copied = TRUE;
- p->deleted = TRUE;
- }
g_ptr_array_free (uids, TRUE);
} else
camel_folder_append_message (outbox, p->message, p->info, p->ex);
+ if (!camel_exception_is_set (p->ex)) {
+ /* a 'move' is a copy & delete */
+ p->copied = TRUE;
+ p->deleted = TRUE;
+ }
+
camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Move to folder %s",
folder);
}