From 1f52a5d0fa5edfa1c138971100df9143ef0c0f8b Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Mon, 14 May 2001 05:06:16 +0000 Subject: Use secondary searches here, so that we control the interference between 2001-05-14 Jon Trowbridge * folder-browser.c (folder_browser_config_search): Use secondary searches here, so that we control the interference between the two bits of searching UI. 2001-05-13 Jon Trowbridge * mail-search.c (mail_search_construct): Destroy the MailSearch dialog if the underlying MailDisplay is destroyed. I don't like the way that label in the dialog with the message subject in it looks, so I've #ifdef-ed it out for now. Center the Matches label --- it makes the dialog look more balanced, I think. (dialog_clicked_cb): Changed to reflect adjusted ESearchingTokenizer API, using primary searches. (toggled_case_cb): Use the primary search API. * e-searching-tokenizer.c: Make searching routines utf8-friendly. Rationalize how the match begin/end markup is handled; allow for begin/end markup that varies by search. Add concept of primary and secondary matching, to disentangle possible interactions between search-bar searches and search-dialog searches. svn path=/trunk/; revision=9789 --- mail/folder-browser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/folder-browser.c') diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 74bce1c6c8..2d904dab22 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -302,7 +302,7 @@ static void folder_browser_config_search(EFilterBar *efb, FilterRule *rule, int st = E_SEARCHING_TOKENIZER (fb->mail_display->html->engine->ht); - e_searching_tokenizer_set_search_string (st, NULL); + e_searching_tokenizer_set_secondary_search_string (st, NULL); /* we scan the parts of a rule, and set all the types we know about to the query string */ partl = rule->parts; @@ -317,7 +317,7 @@ static void folder_browser_config_search(EFilterBar *efb, FilterRule *rule, int FilterInput *input = (FilterInput *)filter_part_find_element(part, "word"); if (input) filter_input_set_value(input, query); - e_searching_tokenizer_set_search_string (st, query); + e_searching_tokenizer_set_secondary_search_string (st, query); } else if(!strcmp(part->name, "sender")) { FilterInput *input = (FilterInput *)filter_part_find_element(part, "sender"); if (input) -- cgit