aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-09-11 10:42:13 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-09-11 10:42:13 +0800
commit778402dd5c05dfb606720949559f6b4d13aa617b (patch)
treed4a5f33c2363921b168bec65f55f79144915de16 /modules/mail
parentd24e00ab2f382b79c9404e10e9ddc0bad1dc5587 (diff)
downloadgsoc2013-evolution-778402dd5c05dfb606720949559f6b4d13aa617b.tar
gsoc2013-evolution-778402dd5c05dfb606720949559f6b4d13aa617b.tar.gz
gsoc2013-evolution-778402dd5c05dfb606720949559f6b4d13aa617b.tar.bz2
gsoc2013-evolution-778402dd5c05dfb606720949559f6b4d13aa617b.tar.lz
gsoc2013-evolution-778402dd5c05dfb606720949559f6b4d13aa617b.tar.xz
gsoc2013-evolution-778402dd5c05dfb606720949559f6b4d13aa617b.tar.zst
gsoc2013-evolution-778402dd5c05dfb606720949559f6b4d13aa617b.zip
Bug 593905 - 'Subject or Addresses contains' search criteria missing
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-view-actions.c15
-rw-r--r--modules/mail/e-mail-shell-view-private.h3
2 files changed, 5 insertions, 13 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 00579ed031..cfa8599bb3 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1418,19 +1418,12 @@ static GtkRadioActionEntry mail_search_entries[] = {
NULL, /* XXX Add a tooltip! */
MAIL_SEARCH_SUBJECT_CONTAINS },
- { "mail-search-subject-or-recipients-contains",
+ { "mail-search-subject-or-addresses-contain",
NULL,
- N_("Subject or Recipients contains"),
+ N_("Subject or Addresses contain"),
NULL,
NULL, /* XXX Add a tooltip! */
- MAIL_SEARCH_SUBJECT_OR_RECIPIENTS_CONTAINS },
-
- { "mail-search-subject-or-sender-contains",
- NULL,
- N_("Subject or Sender contains"),
- NULL,
- NULL, /* XXX Add a tooltip! */
- MAIL_SEARCH_SUBJECT_OR_SENDER_CONTAINS }
+ MAIL_SEARCH_SUBJECT_OR_ADDRESSES_CONTAIN }
};
static GtkRadioActionEntry mail_scope_entries[] = {
@@ -1493,7 +1486,7 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view)
gtk_action_group_add_radio_actions (
action_group, mail_search_entries,
G_N_ELEMENTS (mail_search_entries),
- MAIL_SEARCH_SUBJECT_OR_SENDER_CONTAINS,
+ MAIL_SEARCH_SUBJECT_OR_ADDRESSES_CONTAIN,
G_CALLBACK (action_mail_search_cb), mail_shell_view);
gtk_action_group_add_radio_actions (
action_group, mail_scope_entries,
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index 5c52e1251c..a1c823c8f2 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -107,8 +107,7 @@ enum {
/* Search items are displayed in ascending order. */
enum {
- MAIL_SEARCH_SUBJECT_OR_SENDER_CONTAINS,
- MAIL_SEARCH_SUBJECT_OR_RECIPIENTS_CONTAINS,
+ MAIL_SEARCH_SUBJECT_OR_ADDRESSES_CONTAIN,
MAIL_SEARCH_RECIPIENTS_CONTAIN,
MAIL_SEARCH_MESSAGE_CONTAINS,
MAIL_SEARCH_SUBJECT_CONTAINS,