diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-09-11 21:45:37 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-09-11 22:18:08 +0800 |
| commit | 2834327c0aaee9a6c1b429e0111ce257e2d4a63e (patch) | |
| tree | 0a6d02cf34aff8baf2d38112ab56e2d755e1fe95 | |
| parent | 144af767578bd50a70a85244dd76d181cdcfb669 (diff) | |
| download | gsoc2013-evolution-2834327c0aaee9a6c1b429e0111ce257e2d4a63e.tar.gz gsoc2013-evolution-2834327c0aaee9a6c1b429e0111ce257e2d4a63e.tar.zst gsoc2013-evolution-2834327c0aaee9a6c1b429e0111ce257e2d4a63e.zip | |
Followup fix for bug #593905.
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.h | 6 | ||||
| -rw-r--r-- | 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 3fb7142fff..99819f000e 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 493d761432..4a96dc0b91 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]; |