From 3d92a8f8015569c5272115dcfb6786630e33e8c2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 5 May 2011 16:20:37 -0400 Subject: EMFilterFolderElement: Use the new folder URI format. No longer need to distinguish between Camel URIs and Evolution URIs. --- mail/em-vfolder-context.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'mail/em-vfolder-context.c') diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c index 5f78da434a..ebad8f2bac 100644 --- a/mail/em-vfolder-context.c +++ b/mail/em-vfolder-context.c @@ -124,18 +124,13 @@ vfolder_context_new_element (ERuleContext *context, if (strcmp (type, "score") == 0) return e_filter_int_new_type("score", -3, 3); - if (strcmp (type, "folder-curi") == 0) { - EFilterElement *element; - - element = em_filter_folder_element_new (priv->session); - ((EMFilterFolderElement *) element)->store_camel_uri = TRUE; - - return element; - } - if (strcmp (type, "folder") == 0) return em_filter_folder_element_new (priv->session); + /* XXX Legacy type name. Same as "folder" now. */ + if (strcmp (type, "folder-curi") == 0) + return em_filter_folder_element_new (priv->session); + return E_RULE_CONTEXT_CLASS (em_vfolder_context_parent_class)-> new_element (context, type); } -- cgit