[epiphany/wip/exalm/find-toolbar] find-toolbar: Remove dead code




commit 75de8bc67b9ab159697f676f535ee7b0c6716e42
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Mar 1 17:49:47 2022 +0500

    find-toolbar: Remove dead code

 embed/ephy-find-toolbar.c | 36 +++---------------------------------
 embed/ephy-find-toolbar.h |  4 +---
 src/window-commands.c     |  2 +-
 3 files changed, 5 insertions(+), 37 deletions(-)
---
diff --git a/embed/ephy-find-toolbar.c b/embed/ephy-find-toolbar.c
index 45a71b8e0..33eb9a114 100644
--- a/embed/ephy-find-toolbar.c
+++ b/embed/ephy-find-toolbar.c
@@ -49,8 +49,6 @@ struct _EphyFindToolbar {
   guint find_again_source_id;
   guint find_source_id;
   char *find_string;
-  gboolean links_only;
-  gboolean typing_ahead;
 };
 
 G_DEFINE_TYPE (EphyFindToolbar, ephy_find_toolbar, GTK_TYPE_BIN)
@@ -226,13 +224,6 @@ update_find_string (EphyFindToolbar *toolbar)
   g_source_set_name_by_id (toolbar->find_source_id, "[epiphany] do_search");
 }
 
-static gboolean
-ephy_find_toolbar_activate_link (EphyFindToolbar *toolbar,
-                                 GdkModifierType  mask)
-{
-  return FALSE;
-}
-
 static gboolean
 entry_key_press_event_cb (GtkEntry        *entry,
                           GdkEventKey     *event,
@@ -252,11 +243,6 @@ entry_key_press_event_cb (GtkEntry        *entry,
         handled = FALSE;
         break;
     }
-  } else if ((event->state & mask) == GDK_CONTROL_MASK &&
-             (event->keyval == GDK_KEY_Return ||
-              event->keyval == GDK_KEY_KP_Enter ||
-              event->keyval == GDK_KEY_ISO_Enter)) {
-    handled = ephy_find_toolbar_activate_link (toolbar, event->state);
   } else if ((event->state & mask) == GDK_CONTROL_MASK &&
              (gdk_keyval_to_lower (event->keyval) == GDK_KEY_g)) {
     handled = TRUE;
@@ -276,17 +262,6 @@ entry_key_press_event_cb (GtkEntry        *entry,
   return handled;
 }
 
-static void
-entry_activate_cb (GtkWidget       *entry,
-                   EphyFindToolbar *toolbar)
-{
-  if (toolbar->typing_ahead) {
-    ephy_find_toolbar_activate_link (toolbar, 0);
-  } else {
-    ephy_find_toolbar_find_next (toolbar);
-  }
-}
-
 static void
 ephy_find_toolbar_grab_focus (GtkWidget *widget)
 {
@@ -416,8 +391,8 @@ ephy_find_toolbar_init (EphyFindToolbar *toolbar)
                     G_CALLBACK (entry_key_press_event_cb), toolbar);
   g_signal_connect_after (toolbar->entry, "changed",
                           G_CALLBACK (search_entry_changed_cb), toolbar);
-  g_signal_connect (toolbar->entry, "activate",
-                    G_CALLBACK (entry_activate_cb), toolbar);
+  g_signal_connect_swapped (toolbar->entry, "activate",
+                            G_CALLBACK (ephy_find_toolbar_find_next), toolbar);
   g_signal_connect_swapped (toolbar->next, "clicked",
                             G_CALLBACK (ephy_find_toolbar_find_next), toolbar);
   g_signal_connect_swapped (toolbar->prev, "clicked",
@@ -646,15 +621,10 @@ ephy_find_toolbar_selection_async (GObject      *source_object,
 }
 
 void
-ephy_find_toolbar_open (EphyFindToolbar *toolbar,
-                        gboolean         links_only,
-                        gboolean         typing_ahead)
+ephy_find_toolbar_open (EphyFindToolbar *toolbar)
 {
   g_assert (toolbar->web_view != NULL);
 
-  toolbar->typing_ahead = typing_ahead;
-  toolbar->links_only = links_only;
-
   webkit_web_view_run_javascript (toolbar->web_view, "window.getSelection().toString();", 
toolbar->cancellable, ephy_find_toolbar_selection_async, toolbar);
 
   gtk_editable_select_region (GTK_EDITABLE (toolbar->entry), 0, -1);
diff --git a/embed/ephy-find-toolbar.h b/embed/ephy-find-toolbar.h
index 829c6355d..5b39d5b89 100644
--- a/embed/ephy-find-toolbar.h
+++ b/embed/ephy-find-toolbar.h
@@ -39,9 +39,7 @@ void             ephy_find_toolbar_find_next     (EphyFindToolbar *toolbar);
 
 void             ephy_find_toolbar_find_previous (EphyFindToolbar *toolbar);
 
-void             ephy_find_toolbar_open          (EphyFindToolbar *toolbar,
-                                                  gboolean links_only,
-                                                  gboolean clear_search);
+void             ephy_find_toolbar_open          (EphyFindToolbar *toolbar);
 
 void             ephy_find_toolbar_close         (EphyFindToolbar *toolbar);
 
diff --git a/src/window-commands.c b/src/window-commands.c
index 2ebc302aa..91d62b14c 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -2371,7 +2371,7 @@ window_cmd_find (GSimpleAction *action,
   EphyFindToolbar *toolbar;
 
   toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_current_find_toolbar (window));
-  ephy_find_toolbar_open (toolbar, FALSE, FALSE);
+  ephy_find_toolbar_open (toolbar);
 }
 
 void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]