[epiphany] Close history when escape key is pressed

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 616cc23aa8da34e398400cffcb9230472f374612
Author: Jan-Michael Brummer <jan brummer tabos org>
Date:   Thu Apr 18 21:23:57 2019 +0200

    Close history when escape key is pressed
    
    Fixes: https://gitlab.gnome.org/GNOME/epiphany/issues/728

 src/ephy-history-dialog.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/ephy-history-dialog.c b/src/ephy-history-dialog.c
index dbcae3d6c..5570ba7a3 100644
--- a/src/ephy-history-dialog.c
+++ b/src/ephy-history-dialog.c
@@ -530,8 +530,12 @@ on_key_press_event (EphyHistoryDialog *self,
   ret = gtk_search_bar_handle_event (GTK_SEARCH_BAR (self->search_bar), event);
 
   if (ret != GDK_EVENT_STOP) {
-    if (key->keyval == GDK_KEY_Escape)
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->search_button), FALSE);
+    if (key->keyval == GDK_KEY_Escape) {
+      if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->search_button)))
+        gtk_widget_destroy (GTK_WIDGET (self));
+      else
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->search_button), FALSE);
+    }
     else if (isprint (key->keyval))
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->search_button), TRUE);
   }