[evolution/webkit: 144/196] Magically, ESearchBar seems to work very well

[Dan VrÃtil <dvratil src gnome org>]

commit a8404f88ccdab0eef29cf4c008432c496f42a53e
Author: Dan VrÃtil <dvratil redhat com>
Date:   Thu Feb 9 13:20:27 2012 +0100

    Magically, ESearchBar seems to work very well

 mail/e-mail-browser.c       |    7 -------
 mail/e-mail-paned-view.c    |    6 ------
 widgets/misc/e-search-bar.c |    2 ++
 3 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 56024cb..8619006 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -544,7 +544,6 @@ mail_browser_constructed (GObject *object)
 	EShellBackend *shell_backend;
 	EShell *shell;
 	EFocusTracker *focus_tracker;
-	ESearchBar *search_bar;
 	GSettings *settings;
 	GtkAccelGroup *accel_group;
 	GtkActionGroup *action_group;
@@ -689,12 +688,6 @@ mail_browser_constructed (GObject *object)
 				     GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
 
 	gtk_container_add (GTK_CONTAINER (container), browser->priv->preview_pane);
-	search_bar = e_preview_pane_get_search_bar (
-		E_PREVIEW_PANE (browser->priv->preview_pane));
-
-	g_signal_connect_swapped (
-		search_bar, "changed",
-		G_CALLBACK (e_mail_display_reload), display);
 
 	/* Bind GObject properties to GSettings keys. */
 
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 9237a57..0902bbf 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -618,7 +618,6 @@ mail_paned_view_constructed (GObject *object)
 	EShellView *shell_view;
 	EShell *shell;
 	EShellSettings *shell_settings;
-	ESearchBar *search_bar;
 	EMailReader *reader;
 	EMailBackend *backend;
 	EMailSession *session;
@@ -692,11 +691,6 @@ mail_paned_view_constructed (GObject *object)
 		widget, "visible",
 		G_BINDING_SYNC_CREATE);
 
-	search_bar = e_preview_pane_get_search_bar (E_PREVIEW_PANE (widget));
-	g_signal_connect_swapped (
-		search_bar, "changed",
-		G_CALLBACK (e_mail_display_reload), priv->display);
-
 	/* Load the view instance. */
 
 	e_mail_view_update_view_instance (E_MAIL_VIEW (object));
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index b2f8c36..17a3732 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -127,6 +127,8 @@ search_bar_find (ESearchBar *search_bar,
 	if (new_search) {
 		guint matches;
 
+		webkit_web_view_unmark_text_matches (
+			WEBKIT_WEB_VIEW (web_view));
 		matches = webkit_web_view_mark_text_matches (
 			WEBKIT_WEB_VIEW (web_view),
 			text, case_sensitive, 0);