callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always explicitly clear out the SearchInfo.

Browse Source 
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
This commit is contained in:
Jon Trowbridge
2001-10-16 20:56:21 +00:00
committed by Jon Trowbridge
parent 7abc9f6ba2
commit 1ff31661d8
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mail/ChangeLog
View File

@ -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.

12
mail/e-searching-tokenizer.c
View File

@ -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);
}