From 0fb08f3ff81575a4749d851404233f34252dd2f2 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 21 Oct 2003 18:28:34 +0000 Subject: Merge new-ui-branch to the trunk. svn path=/trunk/; revision=22964 --- mail/mail-autofilter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/mail-autofilter.c') diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index ac116aea7d..9e98758700 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -51,7 +51,6 @@ #include "filter/filter-editor.h" #include "filter/filter-option.h" -extern char *evolution_dir; static void rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddress *iaddr) @@ -313,7 +312,8 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flag g_return_if_fail (msg != NULL); fc = filter_context_new (); - user = g_strdup_printf ("%s/filters.xml", evolution_dir); + user = g_strdup_printf ("%s/filters.xml", + mail_component_peek_base_directory (mail_component_peek ())); system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); rule = filter_rule_from_message (fc, msg, flags); @@ -334,7 +334,7 @@ mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri GList *changed; fc = filter_context_new (); - user = g_strdup_printf ("%s/filters.xml", evolution_dir); + user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); @@ -359,7 +359,7 @@ mail_filter_delete_uri(CamelStore *store, const char *uri) GList *deleted; fc = filter_context_new (); - user = g_strdup_printf ("%s/filters.xml", evolution_dir); + user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); -- cgit v1.2.3