aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/component-factory.c3
-rw-r--r--mail/mail-ops.c7
3 files changed, 10 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b7b9179b01..acccc84a14 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-02 Dan Winship <danw@helixcode.com>
+
+ * mail-ops.c (real_fetch_mail):
+ (vfolder_editor_clicked):
+ * component-factory.c (create_vfolder_storage):
+ Pass mail_uri_to_folder and rules to filter_driver_new.
+
2000-07-02 Ettore Perazzoli <ettore@helixcode.com>
* folder-browser.c (mail_uri_to_folder): Fix double freeing of the
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 643878c89d..92e61e9096 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -240,10 +240,9 @@ create_vfolder_storage (EvolutionShellComponent *shell_component)
int i, count;
char *user, *system;
- fe = filter_driver_new();
user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
system = g_strdup_printf("%s/evolution/vfoldertypes.xml", EVOLUTION_DATADIR);
- filter_driver_set_rules(fe, system, user);
+ fe = filter_driver_new(user, system, mail_uri_to_folder);
g_free(user);
g_free(system);
count = filter_driver_rule_count(fe);
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 54288351fd..be6fcbd364 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -270,11 +270,9 @@ real_fetch_mail (gpointer user_data )
folder_browser_clear_search (fb);
/* apply filtering rules to this inbox */
- filter = filter_driver_new ();
userrules = g_strdup_printf ("%s/filters.xml", evolution_dir);
systemrules = g_strdup_printf ("%s/evolution/filtertypes.xml", EVOLUTION_DATADIR);
- filter_driver_set_rules (filter, systemrules, userrules);
- filter_driver_set_session (filter, session);
+ filter = filter_driver_new (systemrules, userrules, mail_uri_to_folder);
g_free (userrules);
g_free (systemrules);
@@ -812,10 +810,9 @@ vfolder_editor_clicked(FilterEditor *fe, int button, FolderBrowser *fb)
storage = gtk_object_get_data (GTK_OBJECT (fb), "e-storage");
- fe = filter_driver_new ();
user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
system = g_strdup_printf ("%s/evolution/vfoldertypes.xml", EVOLUTION_DATADIR);
- filter_driver_set_rules (fe, system, user);
+ fe = filter_driver_new (system, user, mail_uri_to_folder);
g_free (user);
g_free (system);
count = filter_driver_rule_count (fe);