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/e-searching-tokenizer.c | |
| parent | 84b8798d7b6db9c77f38aa91e3855a64e862bc45 (diff) | |
| download | gsoc2013-evolution-4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8.tar.gz 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/e-searching-tokenizer.c')
| -rw-r--r-- | mail/e-searching-tokenizer.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 020d4d2fe4..d7d30801d9 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -1139,7 +1139,7 @@ e_searching_tokenizer_next_token (HTMLTokenizer *tok) oldmatched = st->priv->engine->matchcount; token = searcher_next_token(st->priv->engine); - + /* not sure if this has to be accurate or just say we had some matches */ if (oldmatched != st->priv->engine->matchcount) g_signal_emit (st, signals[MATCH_SIGNAL], 0); @@ -1239,22 +1239,14 @@ e_searching_tokenizer_set_secondary_case_sensitivity (ESearchingTokenizer *st, g search_info_set_flags(st->priv->secondary, iscase?SEARCH_CASE:0, SEARCH_CASE); } +/* Note: only returns the primary search string count */ gint e_searching_tokenizer_match_count (ESearchingTokenizer *st) { g_return_val_if_fail (E_IS_SEARCHING_TOKENIZER (st), -1); - if (st->priv->engine) + if (st->priv->engine && st->priv->primary->strv->len) return st->priv->engine->matchcount; return 0; } - -void -e_searching_tokenizer_reset (ESearchingTokenizer *st) -{ - if (st->priv->engine) { - searcher_free (st->priv->engine); - st->priv->engine = NULL; - } -} |