From 4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 23 Jun 2004 08:08:40 +0000 Subject: ** See #54030. 2004-06-23 Not Zed ** See #54030. * e-searching-tokenizer.c (e_searching_tokenizer_match_count): only return a count if we're using the primary search string. * em-format-html-display.c (efhd_search_response): set the primary search string to NULL instead of resetting it. (efhd_update_search): dont noop if we have a null search text, just set an empty search. * e-searching-tokenizer.c (e_searching_tokenizer_reset): remove this, revert jeff's fixes for 54030. this is incomplete and so doesn't work either (search text stays remembered and secondary search text lost too). ** See #60523. * em-folder-view.c (emfv_finalise): unhook the folder changed before destroying the async thing, and move it all to destroy event anyway. (emfv_destroy): as above. svn path=/trunk/; revision=26472 --- mail/em-format-html-display.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mail/em-format-html-display.c') diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index ee02347d08..a55189d644 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -423,9 +423,6 @@ efhd_update_search(EMFormatHTMLDisplay *efhd) GSList *words = NULL; int flags = 0; - if (p->search_text == NULL) - return; - if (!gtk_toggle_button_get_active((GtkToggleButton *)p->search_case_check)) flags = EM_FORMAT_HTML_DISPLAY_SEARCH_ICASE | EM_FORMAT_HTML_DISPLAY_SEARCH_PRIMARY; else @@ -465,8 +462,8 @@ efhd_search_response(GtkWidget *w, int button, EMFormatHTMLDisplay *efhd) g_free(p->search_text); p->search_text = NULL; gtk_widget_destroy((GtkWidget *)p->search_dialog); - e_searching_tokenizer_reset (efhd->search_tok); p->search_dialog = NULL; + em_format_html_display_set_search(efhd, EM_FORMAT_HTML_DISPLAY_SEARCH_PRIMARY, NULL); } } -- cgit v1.2.3