diff options
| author | Jon Trowbridge <trow@ximian.com> | 2001-10-17 04:56:21 +0800 |
|---|---|---|
| committer | Jon Trowbridge <trow@src.gnome.org> | 2001-10-17 04:56:21 +0800 |
| commit | 1ff31661d88adcc062630f760535146f2281209d (patch) | |
| tree | 61a6ac99cde9e49ed0299257b1a540381c5edbb8 /mail | |
| parent | 7abc9f6ba2e03dfed3be01bc4f2376506ed9aae6 (diff) | |
| download | gsoc2013-evolution-1ff31661d88adcc062630f760535146f2281209d.tar.gz gsoc2013-evolution-1ff31661d88adcc062630f760535146f2281209d.tar.zst gsoc2013-evolution-1ff31661d88adcc062630f760535146f2281209d.zip | |
Always explicitly clear out the SearchInfo.
2001-10-16 Jon Trowbridge <trow@ximian.com>
* e-searching-tokenizer.c (e_searching_tokenizer_begin): Always
explicitly clear out the SearchInfo.
svn path=/trunk/; revision=13704
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/e-searching-tokenizer.c | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 74ef4d4191..3573ccacf7 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-10-16 Jon Trowbridge <trow@ximian.com> + + * e-searching-tokenizer.c (e_searching_tokenizer_begin): Always + explicitly clear out the SearchInfo. + 2001-10-16 <NotZed@Ximian.com> * mail-folder-cache.c: Added an async_event handler to store_info. diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index e33d8fe149..4100d707e2 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -847,13 +847,16 @@ e_searching_tokenizer_begin (HTMLTokenizer *t, gchar *content_type) ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (t); SearchInfo *si; - if (st->priv->search == NULL && st->priv->shared && (st->priv->shared->str_primary || st->priv->shared->str_secondary)) { + /* Reset our search */ + search_info_free (st->priv->search); + st->priv->search = NULL; + + if (st->priv->shared && (st->priv->shared->str_primary || st->priv->shared->str_secondary)) { st->priv->search = search_info_new (); } si = st->priv->search; - - if (st->priv->shared) { + if (st->priv->shared && si) { if (st->priv->shared->str_primary) { search_info_set_string (si, st->priv->shared->str_primary); @@ -889,7 +892,8 @@ e_searching_tokenizer_begin (HTMLTokenizer *t, gchar *content_type) static void e_searching_tokenizer_end (HTMLTokenizer *t) { - e_searching_tokenizer_cleanup (E_SEARCHING_TOKENIZER (t)); + ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (t); + e_searching_tokenizer_cleanup (st); HTML_TOKENIZER_CLASS (parent_class)->end (t); } |