diff options
| -rw-r--r-- | mail/searchtypes.xml | 24 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 15 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.h | 3 | ||||
| -rw-r--r-- | ui/evolution-mail.ui | 3 |
4 files changed, 16 insertions, 29 deletions
diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml index ba349993f7..f3a89603ed 100644 --- a/mail/searchtypes.xml +++ b/mail/searchtypes.xml @@ -329,7 +329,7 @@ </code> </option> </input> - <input type="address" name="recipient"/> + <input type="string" name="recipient"/> </part> <part name="subject"> @@ -764,33 +764,29 @@ </partset> <ruleset> - <rule grouping="any" source="demand"> - <_title>Subject or Sender contains</_title> + <_title>Subject or Addresses contains</_title> <partset> <part name="subject"> <value name="subject-type" type="option" value="contains"/> <value name="subject" type="string"/> - </part> + </part> <part name="sender"> <value name="sender-type" type="option" value="contains"/> <value name="sender" type="string"/> </part> - </partset> - <sources/> - </rule> - - <rule grouping="any" source="demand"> - <_title>Subject or Recipients contains</_title> - <partset> - <part name="subject"> - <value name="subject-type" type="option" value="contains"/> - <value name="subject" type="string"/> + <part name="to"> + <value name="recipient-type" type="option" value="contains"/> + <value name="recipient" type="address"/> </part> <part name="to"> <value name="recipient-type" type="option" value="contains"/> <value name="recipient" type="address"/> </part> + <part name="to"> + <value name="recipient-type" type="option" value="contains"/> + <value name="recipient" type="address"/> + </part> </partset> <sources/> </rule> 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, diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui index 4c607c9fa5..6b43270ddc 100644 --- a/ui/evolution-mail.ui +++ b/ui/evolution-mail.ui @@ -114,8 +114,7 @@ <placeholder name='mail-message-popup-actions'/> </popup> <popup name='mail-search-options'> - <menuitem action='mail-search-subject-or-sender-contains'/> - <menuitem action='mail-search-subject-or-recipients-contains'/> + <menuitem action='mail-search-subject-or-addresses-contain'/> <menuitem action='mail-search-recipients-contain'/> <menuitem action='mail-search-message-contains'/> <menuitem action='mail-search-subject-contains'/> |