diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-06-23 16:08:40 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-06-23 16:08:40 +0800 |
| commit | 4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8 (patch) | |
| tree | efa26c23e8a19945bc58f52a76b82553a9e84a93 /mail/em-format-html-display.c | |
| parent | 84b8798d7b6db9c77f38aa91e3855a64e862bc45 (diff) | |
| download | gsoc2013-evolution-4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8.tar gsoc2013-evolution-4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8.tar.gz gsoc2013-evolution-4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8.tar.bz2 gsoc2013-evolution-4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8.tar.lz gsoc2013-evolution-4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8.tar.xz gsoc2013-evolution-4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8.tar.zst gsoc2013-evolution-4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8.zip | |
** See #54030.
2004-06-23 Not Zed <NotZed@Ximian.com>
** 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
Diffstat (limited to 'mail/em-format-html-display.c')
| -rw-r--r-- | mail/em-format-html-display.c | 5 |
1 files changed, 1 insertions, 4 deletions
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); } } |