[epiphany] Revert "location-entry: Always select whole text on focus"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 43e148a5e440fa82c8c5971f9e79ff71f941200f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Jun 3 15:37:36 2020 +0000

    Revert "location-entry: Always select whole text on focus"
    
    This reverts commit 1e0d466ebd589271269ae3c52a6932abc2657f7e

 lib/widgets/ephy-location-entry.c | 46 +++++++--------------------------------
 1 file changed, 8 insertions(+), 38 deletions(-)
---
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index e8dc64512..978febbd5 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -68,7 +68,6 @@ struct _EphyLocationEntry {
   GtkCssProvider *css_provider;
 
   gboolean reader_mode_active;
-  gboolean button_release_is_blocked;
 
   char *saved_text;
   char *jump_tab;
@@ -116,39 +115,6 @@ G_DEFINE_TYPE_WITH_CODE (EphyLocationEntry, ephy_location_entry, GTK_TYPE_OVERLA
                          G_IMPLEMENT_INTERFACE (EPHY_TYPE_TITLE_WIDGET,
                                                 ephy_location_entry_title_widget_interface_init))
 
-static gboolean
-entry_button_release (GtkWidget *widget,
-                      GdkEvent  *event,
-                      gpointer   user_data)
-{
-  EphyLocationEntry *entry = EPHY_LOCATION_ENTRY (user_data);
-
-  gtk_editable_select_region (GTK_EDITABLE (entry->url_entry), 0, -1);
-
-  g_signal_handlers_block_by_func (widget, G_CALLBACK (entry_button_release), entry);
-  entry->button_release_is_blocked = TRUE;
-
-  return GDK_EVENT_STOP;
-}
-
-static gboolean
-entry_focus_out_event (GtkWidget *widget,
-                       GdkEvent  *event,
-                       gpointer   user_data)
-{
-  EphyLocationEntry *entry = EPHY_LOCATION_ENTRY (user_data);
-
-  /* Unselect. */
-  gtk_editable_select_region (GTK_EDITABLE (entry->url_entry), 0, 0);
-
-  if (entry->button_release_is_blocked) {
-    g_signal_handlers_unblock_by_func (widget, G_CALLBACK (entry_button_release), entry);
-    entry->button_release_is_blocked = FALSE;
-  }
-
-  return GDK_EVENT_PROPAGATE;
-}
-
 static void
 editable_changed_cb (GtkEditable       *editable,
                      EphyLocationEntry *entry);
@@ -1079,8 +1045,6 @@ ephy_location_entry_construct_contents (EphyLocationEntry *entry)
   g_signal_connect (entry->url_entry, "suggestion-activated",
                     G_CALLBACK (ephy_location_entry_suggestion_activated), entry);
 
-  g_signal_connect (entry->url_entry, "button-release-event", G_CALLBACK (entry_button_release), entry);
-  g_signal_connect (entry->url_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event), entry);
 
   controller = dzl_shortcut_controller_find (entry->url_entry);
   dzl_shortcut_controller_add_command_callback (controller,
@@ -1107,7 +1071,6 @@ ephy_location_entry_init (EphyLocationEntry *le)
 
   le->user_changed = FALSE;
   le->block_update = FALSE;
-  le->button_release_is_blocked = FALSE;
   le->saved_text = NULL;
 
   ephy_location_entry_construct_contents (le);
@@ -1311,7 +1274,14 @@ ephy_location_entry_reset (EphyLocationEntry *entry)
 void
 ephy_location_entry_focus (EphyLocationEntry *entry)
 {
-  gtk_widget_grab_focus (GTK_WIDGET (entry->url_entry));
+  GtkWidget *toplevel, *widget = GTK_WIDGET (entry->url_entry);
+
+  toplevel = gtk_widget_get_toplevel (widget);
+
+  gtk_editable_select_region (GTK_EDITABLE (entry->url_entry),
+                              0, -1);
+  gtk_window_set_focus (GTK_WINDOW (toplevel),
+                        widget);
 }
 
 void