[evolution] Followup fix for bug #593905.

[Matthew Barnes <mbarnes src gnome org>]

commit 2834327c0aaee9a6c1b429e0111ce257e2d4a63e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Sep 11 08:45:37 2009 -0500

    Followup fix for bug #593905.

 modules/mail/e-mail-shell-view-actions.h |    6 ++----
 modules/mail/e-mail-shell-view.c         |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/modules/mail/e-mail-shell-view-actions.h b/modules/mail/e-mail-shell-view-actions.h
index 3fb7142..99819f0 100644
--- a/modules/mail/e-mail-shell-view-actions.h
+++ b/modules/mail/e-mail-shell-view-actions.h
@@ -243,10 +243,8 @@
 	E_SHELL_WINDOW_ACTION ((window), "mail-search-sender-contains")
 #define E_SHELL_WINDOW_ACTION_MAIL_SEARCH_SUBJECT_CONTAINS(window) \
 	E_SHELL_WINDOW_ACTION ((window), "mail-search-subject-contains")
-#define E_SHELL_WINDOW_ACTION_MAIL_SEARCH_SUBJECT_OR_RECIPIENTS_CONTAINS(window) \
-	E_SHELL_WINDOW_ACTION ((window), "mail-search-subject-or-recipients-contains")
-#define E_SHELL_WINDOW_ACTION_MAIL_SEARCH_SUBJECT_OR_SENDER_CONTAINS(window) \
-	E_SHELL_WINDOW_ACTION ((window), "mail-search-subject-or-sender-contains")
+#define E_SHELL_WINDOW_ACTION_MAIL_SEARCH_SUBJECT_OR_ADDRESSES_CONTAIN(window) \
+	E_SHELL_WINDOW_ACTION ((window), "mail-search-subject-or-addresses-contain")
 
 /* Action Groups */
 #define E_SHELL_WINDOW_ACTION_GROUP_MAIL(window) \
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 493d761..4a96dc0 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -163,7 +163,7 @@ mail_shell_view_execute_search (EShellView *shell_view)
 	/* Replace variables in the selected rule with the
 	 * current search text and extract a query string. */
 
-	action = ACTION (MAIL_SEARCH_SUBJECT_OR_SENDER_CONTAINS);
+	action = ACTION (MAIL_SEARCH_SUBJECT_OR_ADDRESSES_CONTAIN);
 	value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action));
 	g_return_if_fail (value >= 0 && value < MAIL_NUM_SEARCH_RULES);
 	rule = priv->search_rules[value];