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/e-searching-tokenizer.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'mail/e-searching-tokenizer.h') diff --git a/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h index bf7e473ded..7852548c04 100644 --- a/mail/e-searching-tokenizer.h +++ b/mail/e-searching-tokenizer.h @@ -59,8 +59,14 @@ GtkType e_searching_tokenizer_get_type (void); HTMLTokenizer *e_searching_tokenizer_new (void); /* For now, just a simple API */ -void e_searching_tokenizer_set_search_string (ESearchingTokenizer *, const gchar *); -void e_searching_tokenizer_set_case_sensitivity (ESearchingTokenizer *, gboolean is_case_sensitive); + +void e_searching_tokenizer_set_primary_search_string (ESearchingTokenizer *, const gchar *); +void e_searching_tokenizer_set_primary_case_sensitivity (ESearchingTokenizer *, gboolean is_case_sensitive); + +void e_searching_tokenizer_set_secondary_search_string (ESearchingTokenizer *, const gchar *); +void e_searching_tokenizer_set_secondary_case_sensitivity (ESearchingTokenizer *, gboolean is_case_sensitive); + + gint e_searching_tokenizer_match_count (ESearchingTokenizer *); -- cgit