[devhelp] Window: ensure that the WebView search is up-to-date before prev/next

[Sébastien Wilmet <swilmet src gnome org>]

commit a509295129a9c9c888dfa1ffc1074fd2e7a1053f
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Feb 2 21:53:55 2018 +0100

    Window: ensure that the WebView search is up-to-date before prev/next

 src/dh-window.c |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/src/dh-window.c b/src/dh-window.c
index b63c313..0064617 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -594,18 +594,26 @@ launch_search_in_active_web_view (DhWindow *window)
         DhWindowPrivate *priv = dh_window_get_instance_private (window);
         WebKitWebView *view;
         WebKitFindController *find_controller;
-        const gchar *search_text;
+        const gchar *cur_search_text;
+        const gchar *new_search_text;
 
         view = window_get_active_web_view (window);
         find_controller = webkit_web_view_get_find_controller (view);
 
-        search_text = gtk_entry_get_text (GTK_ENTRY (priv->search_entry));
+        cur_search_text = webkit_find_controller_get_search_text (find_controller);
+        new_search_text = gtk_entry_get_text (GTK_ENTRY (priv->search_entry));
 
-        webkit_find_controller_search (find_controller,
-                                       search_text,
-                                       WEBKIT_FIND_OPTIONS_WRAP_AROUND |
-                                       WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE,
-                                       G_MAXUINT);
+        if (g_strcmp0 (cur_search_text, new_search_text) != 0) {
+                /* If webkit_find_controller_search() is called a second time
+                 * with the same parameters it's not a NOP, it launches a new
+                 * search (apparently). So we must call it only once.
+                 */
+                webkit_find_controller_search (find_controller,
+                                               new_search_text,
+                                               WEBKIT_FIND_OPTIONS_WRAP_AROUND |
+                                               WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE,
+                                               G_MAXUINT);
+        }
 }
 
 static void
@@ -636,6 +644,9 @@ search_previous_in_active_web_view (DhWindow *window)
         WebKitWebView *view;
         WebKitFindController *find_controller;
 
+        /* Ensure that webkit_find_controller_search() is called before. */
+        launch_search_in_active_web_view (window);
+
         view = window_get_active_web_view (window);
         find_controller = webkit_web_view_get_find_controller (view);
 
@@ -648,6 +659,9 @@ search_next_in_active_web_view (DhWindow *window)
         WebKitWebView *view;
         WebKitFindController *find_controller;
 
+        /* Ensure that webkit_find_controller_search() is called before. */
+        launch_search_in_active_web_view (window);
+
         view = window_get_active_web_view (window);
         find_controller = webkit_web_view_get_find_controller (view);
 
@@ -669,6 +683,7 @@ static void
 search_changed_cb (GtkEntry *entry,
                    DhWindow *window)
 {
+        /* Note that this callback is called after a small delay. */
         launch_search_in_active_web_view (window);
 }