aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-vfolder-context.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/em-vfolder-context.c')
-rw-r--r--mail/em-vfolder-context.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c
index b111376b20..789735683c 100644
--- a/mail/em-vfolder-context.c
+++ b/mail/em-vfolder-context.c
@@ -30,14 +30,14 @@
#include "em-vfolder-context.h"
#include "em-vfolder-rule.h"
-#include "filter/filter-option.h"
-#include "filter/filter-int.h"
+#include "filter/e-filter-option.h"
+#include "filter/e-filter-int.h"
#include "em-filter-folder-element.h"
-static FilterElement *vfolder_new_element(RuleContext *rc, const gchar *type);
+static EFilterElement *vfolder_new_element(ERuleContext *rc, const gchar *type);
-static RuleContextClass *parent_class = NULL;
+static ERuleContextClass *parent_class = NULL;
static void
em_vfolder_context_finalise(GObject *obj)
@@ -48,22 +48,22 @@ em_vfolder_context_finalise(GObject *obj)
static void
em_vfolder_context_class_init(EMVFolderContextClass *klass)
{
- parent_class = g_type_class_ref(RULE_TYPE_CONTEXT);
+ parent_class = g_type_class_ref(E_TYPE_RULE_CONTEXT);
((GObjectClass *)klass)->finalize = em_vfolder_context_finalise;
- ((RuleContextClass *)klass)->new_element = vfolder_new_element;
+ ((ERuleContextClass *)klass)->new_element = vfolder_new_element;
}
static void
em_vfolder_context_init(EMVFolderContext *vc)
{
- rule_context_add_part_set((RuleContext *) vc, "partset", filter_part_get_type(),
- rule_context_add_part, rule_context_next_part);
+ e_rule_context_add_part_set((ERuleContext *) vc, "partset", E_TYPE_FILTER_PART,
+ e_rule_context_add_part, e_rule_context_next_part);
- rule_context_add_rule_set((RuleContext *) vc, "ruleset", em_vfolder_rule_get_type(),
- rule_context_add_rule, rule_context_next_rule);
+ e_rule_context_add_rule_set((ERuleContext *) vc, "ruleset", em_vfolder_rule_get_type(),
+ e_rule_context_add_rule, e_rule_context_next_rule);
- ((RuleContext *)vc)->flags = RULE_CONTEXT_THREADING | RULE_CONTEXT_GROUPING;
+ ((ERuleContext *)vc)->flags = E_RULE_CONTEXT_THREADING | E_RULE_CONTEXT_GROUPING;
}
GType
@@ -84,7 +84,7 @@ em_vfolder_context_get_type(void)
(GInstanceInitFunc) em_vfolder_context_init,
};
- type = g_type_register_static(RULE_TYPE_CONTEXT, "EMVFolderContext", &info, 0);
+ type = g_type_register_static(E_TYPE_RULE_CONTEXT, "EMVFolderContext", &info, 0);
}
return type;
@@ -103,20 +103,20 @@ em_vfolder_context_new(void)
return (EMVFolderContext *)g_object_new(em_vfolder_context_get_type(), NULL, NULL);
}
-static FilterElement *
-vfolder_new_element(RuleContext *rc, const gchar *type)
+static EFilterElement *
+vfolder_new_element(ERuleContext *rc, const gchar *type)
{
if (!strcmp(type, "system-flag")) {
- return (FilterElement *) filter_option_new();
+ return (EFilterElement *) e_filter_option_new();
} else if (!strcmp(type, "score")) {
- return (FilterElement *) filter_int_new_type("score", -3, 3);
+ return (EFilterElement *) e_filter_int_new_type("score", -3, 3);
} else if (!strcmp(type, "folder-curi")) {
EMFilterFolderElement *ff = em_filter_folder_element_new ();
if (ff)
ff->store_camel_uri = TRUE;
- return (FilterElement *) ff;
+ return (EFilterElement *) ff;
} else if (!strcmp(type, "folder")) {
- return (FilterElement *) em_filter_folder_element_new();
+ return (EFilterElement *) em_filter_folder_element_new();
} else {
return parent_class->new_element(rc, type);
}