diff options
Diffstat (limited to 'mail/mail-component.c')
| -rw-r--r-- | mail/mail-component.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/mail/mail-component.c b/mail/mail-component.c index 8a72dbba4d..76212813eb 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -49,7 +49,7 @@ #include "widgets/misc/e-info-label.h" #include "widgets/misc/e-error.h" -#include "filter/rule-context.h" +#include "em-search-context.h" #include "mail-config.h" #include "mail-component.h" #include "mail-folder-cache.h" @@ -172,7 +172,6 @@ static void mc_add_store(MailComponent *component, CamelStore *store, const char *name, void (*done)(CamelStore *store, CamelFolderInfo *info, void *data)) { struct _store_info *si; - char *uri; MAIL_COMPONENT_DEFAULT(component); @@ -297,18 +296,9 @@ setup_search_context (MailComponent *component) char *user = g_build_filename(component->priv->base_directory, "mail/searches.xml", NULL); char *system = g_strdup (EVOLUTION_PRIVDATADIR "/searchtypes.xml"); - priv->search_context = rule_context_new (); - /* This is a sort of hack, but saves us having to have a search context just to do it for us */ - priv->search_context->flags |= RULE_CONTEXT_THREADING; + priv->search_context = (RuleContext *)em_search_context_new (); g_object_set_data_full (G_OBJECT (priv->search_context), "user", user, g_free); g_object_set_data_full (G_OBJECT (priv->search_context), "system", system, g_free); - - rule_context_add_part_set (priv->search_context, "partset", filter_part_get_type (), - rule_context_add_part, rule_context_next_part); - - rule_context_add_rule_set (priv->search_context, "ruleset", filter_rule_get_type (), - rule_context_add_rule, rule_context_next_rule); - rule_context_load (priv->search_context, system, user); } } |