diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/folder-browser.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b5ab8c1e41..2c9faed0af 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-01-26 Ettore Perazzoli <ettore@ximian.com> + + * folder-browser.c: Add a missing parenthesis to the "from + contains" rule. Also make it the last item instead of the first + one. + 2001-01-25 Iain Holmes <iain@ximian.com> * component-factory.c (component_factory_init): Init the mail diff --git a/mail/folder-browser.c b/mail/folder-browser.c index f7f77ffe31..d7f70e4a64 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -227,21 +227,21 @@ static ESearchBarItem folder_browser_search_menu_items[] = { }; enum { - ESB_SENDER_CONTAINS, ESB_BODY_SUBJECT_CONTAINS, ESB_BODY_CONTAINS, ESB_SUBJECT_CONTAINS, ESB_BODY_DOES_NOT_CONTAIN, ESB_SUBJECT_DOES_NOT_CONTAIN, + ESB_SENDER_CONTAINS, }; static ESearchBarItem folder_browser_search_option_items[] = { - { N_("Sender contains"), ESB_SENDER_CONTAINS }, { N_("Body or subject contains"), ESB_BODY_SUBJECT_CONTAINS }, { N_("Body contains"), ESB_BODY_CONTAINS }, { N_("Subject contains"), ESB_SUBJECT_CONTAINS }, { N_("Body does not contain"), ESB_BODY_DOES_NOT_CONTAIN }, { N_("Subject does not contain"), ESB_SUBJECT_DOES_NOT_CONTAIN }, + { N_("Sender contains"), ESB_SENDER_CONTAINS }, { NULL, -1 } }; @@ -249,12 +249,12 @@ static ESearchBarItem folder_browser_search_option_items[] = { /* %s is replaced by the whole search string in quotes ... possibly could split the search string into words as well ? */ static char *search_string[] = { - "(match-all (header-contains \"from\" %s)", "(or (body-contains %s) (match-all (header-contains \"Subject\" %s)))", "(body-contains %s)", "(match-all (header-contains \"Subject\" %s))", "(match-all (not (body-contains %s)))", "(match-all (not (header-contains \"Subject\" %s)))", + "(match-all (header-contains \"from\" %s))", }; static void |