From 2b16aef84141800099f859e72d05e1e6bf8e02dd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 25 Oct 2009 09:17:23 -0400 Subject: Cleanup and rename filter classes. --- modules/addressbook/e-book-shell-view-actions.c | 2 +- modules/addressbook/e-book-shell-view.c | 8 ++++---- modules/calendar/e-cal-shell-view.c | 8 ++++---- modules/calendar/e-memo-shell-view.c | 8 ++++---- modules/calendar/e-task-shell-view.c | 8 ++++---- modules/mail/e-mail-shell-backend.c | 2 +- modules/mail/e-mail-shell-view-actions.c | 8 ++++---- modules/mail/e-mail-shell-view-private.c | 14 +++++++------- modules/mail/e-mail-shell-view-private.h | 4 ++-- modules/mail/e-mail-shell-view.c | 20 ++++++++++---------- 10 files changed, 41 insertions(+), 41 deletions(-) (limited to 'modules') diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index 1d875ba91a..c680c64ede 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/modules/addressbook/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c index f7019b0b3a..4a09a14825 100644 --- a/modules/addressbook/e-book-shell-view.c +++ b/modules/addressbook/e-book-shell-view.c @@ -131,7 +131,7 @@ book_shell_view_execute_search (EShellView *shell_view) GString *string; EAddressbookView *view; EAddressbookModel *model; - FilterRule *rule; + EFilterRule *rule; const gchar *format; const gchar *text; gchar *query; @@ -208,10 +208,10 @@ book_shell_view_execute_search (EShellView *shell_view) } } - /* XXX This is wrong. We need to programmatically construct a - * FilterRule, tell it to build code, and pass the resulting + /* XXX This is wrong. We need to programmatically construct an + * EFilterRule, tell it to build code, and pass the resulting * expression string to EAddressbookModel. */ - rule = filter_rule_new (); + rule = e_filter_rule_new (); e_shell_content_set_search_rule (shell_content, rule); g_object_unref (rule); diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c index 32f12b605f..41782deb7f 100644 --- a/modules/calendar/e-cal-shell-view.c +++ b/modules/calendar/e-cal-shell-view.c @@ -63,7 +63,7 @@ cal_shell_view_execute_search (EShellView *shell_view) ECalendar *date_navigator; GtkRadioAction *action; GString *string; - FilterRule *rule; + EFilterRule *rule; const gchar *format; const gchar *text; time_t start_range; @@ -179,10 +179,10 @@ cal_shell_view_execute_search (EShellView *shell_view) } } - /* XXX This is wrong. We need to programmatically construct a - * FilterRule, tell it to build code, and pass the resulting + /* XXX This is wrong. We need to programmatically construct an + * EFilterRule, tell it to build code, and pass the resulting * expressing string to ECalModel. */ - rule = filter_rule_new (); + rule = e_filter_rule_new (); e_shell_content_set_search_rule (shell_content, rule); g_object_unref (rule); diff --git a/modules/calendar/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c index ea869b55c4..f5698fe9b7 100644 --- a/modules/calendar/e-memo-shell-view.c +++ b/modules/calendar/e-memo-shell-view.c @@ -62,7 +62,7 @@ memo_shell_view_execute_search (EShellView *shell_view) ECalComponentPreview *memo_preview; EMemoTable *memo_table; ECalModel *model; - FilterRule *rule; + EFilterRule *rule; const gchar *format; const gchar *text; gchar *query; @@ -135,10 +135,10 @@ memo_shell_view_execute_search (EShellView *shell_view) } } - /* XXX This is wrong. We need to programmatically construct a - * FilterRule, tell it to build code, and pass the resulting + /* XXX This is wrong. We need to programmatically construct an + * EFilterRule, tell it to build code, and pass the resulting * expression string to ECalModel. */ - rule = filter_rule_new (); + rule = e_filter_rule_new (); e_shell_content_set_search_rule (shell_content, rule); g_object_unref (rule); diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c index 650037b730..ec7d697a9d 100644 --- a/modules/calendar/e-task-shell-view.c +++ b/modules/calendar/e-task-shell-view.c @@ -101,7 +101,7 @@ task_shell_view_execute_search (EShellView *shell_view) ECalComponentPreview *task_preview; ECalendarTable *task_table; ECalModel *model; - FilterRule *rule; + EFilterRule *rule; const gchar *format; const gchar *text; time_t start_range; @@ -247,10 +247,10 @@ task_shell_view_execute_search (EShellView *shell_view) query = temp2; } - /* XXX This is wrong. We need to programmatically construct a - * FilterRule, tell it to build code, and pass the resulting + /* XXX This is wrong. We need to programmatically construct an + * EFilterRule, tell it to build code, and pass the resulting * expression string to ECalModel. */ - rule = filter_rule_new (); + rule = e_filter_rule_new (); e_shell_content_set_search_rule (shell_content, rule); g_object_unref (rule); diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 877087c546..0572cfd762 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -935,7 +935,7 @@ e_mail_shell_backend_register_type (GTypeModule *type_module) /******************* Code below here belongs elsewhere. *******************/ -#include "filter/filter-option.h" +#include "filter/e-filter-option.h" #include "shell/e-shell-settings.h" #include "mail/e-mail-label-list-store.h" diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 22aa88edcf..07fdf8f366 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -84,7 +84,7 @@ action_mail_create_search_folder_cb (GtkAction *action, EShellView *shell_view; EShellContent *shell_content; MessageList *message_list; - FilterRule *search_rule; + EFilterRule *search_rule; EMVFolderRule *vfolder_rule; const gchar *folder_uri; const gchar *search_text; @@ -108,8 +108,8 @@ action_mail_create_search_folder_cb (GtkAction *action, search_rule = vfolder_clone_rule (search_rule); rule_name = g_strdup_printf ("%s %s", search_rule->name, search_text); - filter_rule_set_source (search_rule, FILTER_SOURCE_INCOMING); - filter_rule_set_name (search_rule, rule_name); + e_filter_rule_set_source (search_rule, E_FILTER_SOURCE_INCOMING); + e_filter_rule_set_name (search_rule, rule_name); g_free (rule_name); vfolder_rule = EM_VFOLDER_RULE (search_rule); @@ -969,7 +969,7 @@ action_search_quick_cb (GtkAction *action, EShellView *shell_view; EShellWindow *shell_window; EShellContent *shell_content; - FilterRule *search_rule; + EFilterRule *search_rule; gint value; /* Set the search rule in EShellContent so that "Create diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index e6c5417b9a..dd124f43c6 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -347,8 +347,8 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) EShellWindow *shell_window; EMFormatHTMLDisplay *html_display; EMFolderTree *folder_tree; - RuleContext *context; - FilterRule *rule = NULL; + ERuleContext *context; + EFilterRule *rule = NULL; GtkTreeSelection *selection; GtkTreeModel *tree_model; GtkUIManager *ui_manager; @@ -489,8 +489,8 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) * Keep the assertions, please. If the conditions aren't * met we're going to crash anyway, just more mysteriously. */ context = e_shell_content_get_search_context (shell_content); - source = FILTER_SOURCE_DEMAND; - while ((rule = rule_context_next_rule (context, rule, source))) { + source = E_FILTER_SOURCE_DEMAND; + while ((rule = e_rule_context_next_rule (context, rule, source))) { g_assert (ii < MAIL_NUM_SEARCH_RULES); priv->search_rules[ii++] = g_object_ref (rule); } @@ -592,11 +592,11 @@ e_mail_shell_view_create_filter_from_selected (EMailShellView *mail_shell_view, folder = message_list->folder; if (em_utils_folder_is_sent (folder, folder_uri)) - filter_source = FILTER_SOURCE_OUTGOING; + filter_source = E_FILTER_SOURCE_OUTGOING; else if (em_utils_folder_is_outbox (folder, folder_uri)) - filter_source = FILTER_SOURCE_OUTGOING; + filter_source = E_FILTER_SOURCE_OUTGOING; else - filter_source = FILTER_SOURCE_INCOMING; + filter_source = E_FILTER_SOURCE_INCOMING; uids = message_list_get_selected (message_list); diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index a1c823c8f2..bf86f33720 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -35,7 +35,7 @@ #include "e-util/e-binding.h" #include "e-util/gconf-bridge.h" #include "e-util/e-account-utils.h" -#include "filter/filter-part.h" +#include "filter/e-filter-part.h" #include "widgets/misc/e-web-view.h" #include "widgets/misc/e-popup-action.h" #include "widgets/menus/gal-view-instance.h" @@ -137,7 +137,7 @@ struct _EMailShellViewPrivate { guint label_merge_id; /* Filter rules correspond to the search entry menu. */ - FilterRule *search_rules[MAIL_NUM_SEARCH_RULES]; + EFilterRule *search_rules[MAIL_NUM_SEARCH_RULES]; guint show_deleted : 1; }; diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index b2ea509422..3c82e516bc 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -92,7 +92,7 @@ mail_shell_view_execute_search (EShellView *shell_view) EMFormatHTMLDisplay *html_display; EMailShellContent *mail_shell_content; MessageList *message_list; - FilterRule *rule; + EFilterRule *rule; EMailReader *reader; CamelFolder *folder; GtkAction *action; @@ -169,17 +169,17 @@ mail_shell_view_execute_search (EShellView *shell_view) rule = priv->search_rules[value]; for (iter = rule->parts; iter != NULL; iter = iter->next) { - FilterPart *part = iter->data; - FilterElement *element = NULL; + EFilterPart *part = iter->data; + EFilterElement *element = NULL; if (strcmp (part->name, "subject") == 0) - element = filter_part_find_element (part, "subject"); + element = e_filter_part_find_element (part, "subject"); else if (strcmp (part->name, "body") == 0) - element = filter_part_find_element (part, "word"); + element = e_filter_part_find_element (part, "word"); else if (strcmp (part->name, "sender") == 0) - element = filter_part_find_element (part, "sender"); + element = e_filter_part_find_element (part, "sender"); else if (strcmp (part->name, "to") == 0) - element = filter_part_find_element (part, "recipient"); + element = e_filter_part_find_element (part, "recipient"); if (strcmp (part->name, "body") == 0) { struct _camel_search_words *words; @@ -194,13 +194,13 @@ mail_shell_view_execute_search (EShellView *shell_view) } if (element != NULL) { - FilterInput *input = FILTER_INPUT (element); - filter_input_set_value (input, text); + EFilterInput *input = E_FILTER_INPUT (element); + e_filter_input_set_value (input, text); } } string = g_string_sized_new (1024); - filter_rule_build_code (rule, string); + e_filter_rule_build_code (rule, string); query = g_string_free (string, FALSE); filter: -- cgit v1.2.3