diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/mail-ops.c | 2 | ||||
| -rw-r--r-- | mail/mail-session.c | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 7f5263abfd..87b1e60e0c 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2004-01-26 Radek Doulik <rodo@ximian.com> + + * mail-session.c (main_get_filter_driver): translate DEMAND to + INCOMING to get the right rules + + * mail-ops.c (mail_filter_on_demand): use FILTER_SOURCE_DEMAND + + Fixes #53266 + 2004-01-25 Rodney Dawes <dobey@ximian.com> * em-folder-selector.c (em_folder_selector_create_new): Cast the diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 9804584bc1..c389483cac 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -211,7 +211,7 @@ mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids, void mail_filter_on_demand (CamelFolder *folder, GPtrArray *uids) { - mail_filter_folder (folder, uids, FILTER_SOURCE_INCOMING, FALSE, NULL); + mail_filter_folder (folder, uids, FILTER_SOURCE_DEMAND, FALSE, NULL); } /* ********************************************************************** */ diff --git a/mail/mail-session.c b/mail/mail-session.c index c51a1f7aaf..f9e22a739f 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -646,6 +646,9 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException fsearch = g_string_new (""); faction = g_string_new (""); + if (!strcmp (type, FILTER_SOURCE_DEMAND)) + type = FILTER_SOURCE_INCOMING; + /* add the user-defined rules next */ while ((rule = rule_context_next_rule (fc, rule, type))) { g_string_truncate (fsearch, 0); |