aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-08-19 19:54:32 +0800
committerMilan Crha <mcrha@redhat.com>2011-08-19 19:54:32 +0800
commit6b13cb5be7462b7e6e43af07e6051a553fb5d127 (patch)
tree551ad1bfad5c9ca676516ba4a662237c953c63e7
parentc8061dd92686417fc0bf3aba83825643f1ad4d2b (diff)
downloadgsoc2013-evolution-6b13cb5be7462b7e6e43af07e6051a553fb5d127.tar.gz
gsoc2013-evolution-6b13cb5be7462b7e6e43af07e6051a553fb5d127.tar.zst
gsoc2013-evolution-6b13cb5be7462b7e6e43af07e6051a553fb5d127.zip
Bug #651741 - Find in text message doesn't warn about no matching found
-rw-r--r--widgets/misc/e-search-bar.c2
-rw-r--r--widgets/misc/e-searching-tokenizer.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index db72c5860e..d70106e060 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -72,6 +72,8 @@ search_bar_update_matches (ESearchBar *search_bar)
gint matches;
gchar *text;
+ search_bar->priv->rerun_search = FALSE;
+
tokenizer = e_search_bar_get_tokenizer (search_bar);
matches_label = search_bar->priv->matches_label;
diff --git a/widgets/misc/e-searching-tokenizer.c b/widgets/misc/e-searching-tokenizer.c
index 3da81e44bd..3720030815 100644
--- a/widgets/misc/e-searching-tokenizer.c
+++ b/widgets/misc/e-searching-tokenizer.c
@@ -401,7 +401,7 @@ searcher_new (gint flags,
s->tage = g_strdup (tage);
s->flags = flags;
s->state = &s->t->root;
- s->matchcount = 0;
+ s->matchcount = -1;
g_queue_init (&s->input);
g_queue_init (&s->output);
@@ -1019,6 +1019,8 @@ searching_tokenizer_next_token (HTMLTokenizer *tokenizer)
next_token (tokenizer);
oldmatched = priv->engine->matchcount;
+ if (priv->engine->matchcount == -1)
+ priv->engine->matchcount = 0;
token = searcher_next_token (priv->engine);