[balsa] main-window: Revert the previous commit

[Peter Bloomfield <peterb src gnome org>]

commit e29f20a6d3a08d522cc01284155d277f88b022e7
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Jun 4 15:38:17 2020 -0400

    main-window: Revert the previous commit

 ChangeLog         | 12 ------------
 src/main-window.c | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 84ff30622..fa7b79a17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,3 @@
-2020-06-03  Peter Bloomfield  <pbloomfield bellsouth net>
-
-       main-window: Connect to the "focus-{in,out}" signals of a
-       GtkEventControllerKey instead of the "focus-{in,out}-event" widget
-       signals.
-
-       This is preparation for GTK4, but will still need to be changed
-       to use GtkEventControllerFocus in that distant future.
-
-       * src/main-window.c (bw_enable_filter), (bw_disable_filter),
-       (bw_create_index_widget):
-
 2020-06-03  Peter Bloomfield  <pbloomfield bellsouth net>
 
        mime-widget-text: Connect to the "pressed" signal of a
diff --git a/src/main-window.c b/src/main-window.c
index c3bfbd6fb..70d927e18 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -374,22 +374,20 @@ bw_pass_to_filter(BalsaWindow *window, GdkEventKey *event, gpointer data)
 
     return res;
 }
-
-static void
-bw_enable_filter(GtkEventControllerKey *eventcontrollerkey,
-                 gpointer               user_data)
+static gboolean
+bw_enable_filter(GtkWidget *widget, GdkEventFocus *event, gpointer data)
 {
-    g_signal_connect(user_data, "key_press_event",
+    g_signal_connect(data, "key_press_event",
                      G_CALLBACK(bw_pass_to_filter), NULL);
+    return FALSE;
 }
-
-static void
-bw_disable_filter(GtkEventControllerKey *eventcontrollerkey,
-                  gpointer               user_data)
+static gboolean
+bw_disable_filter(GtkWidget *widget, GdkEventFocus *event, gpointer data)
 {
-    g_signal_handlers_disconnect_by_func(user_data,
+    g_signal_handlers_disconnect_by_func(data,
                                          G_CALLBACK(bw_pass_to_filter),
                                          NULL);
+    return FALSE;
 }
 
 static void
@@ -538,7 +536,6 @@ bw_create_index_widget(BalsaWindow *bw)
     BalsaWindowPrivate *priv = balsa_window_get_instance_private(bw);
     GtkWidget *vbox, *button;
     unsigned i;
-    GtkEventController *key_controller;
 
     if(!view_filters_translated) {
         for(i=0; i<G_N_ELEMENTS(view_filters); i++)
@@ -560,10 +557,9 @@ bw_create_index_widget(BalsaWindow *bw)
     priv->sos_entry = gtk_search_entry_new();
     /* gtk_label_set_mnemonic_widget(GTK_LABEL(priv->filter_choice),
        priv->sos_entry); */
-    key_controller = gtk_event_controller_key_new(priv->sos_entry);
-    g_signal_connect(key_controller, "focus-in",
+    g_signal_connect(priv->sos_entry, "focus_in_event",
                      G_CALLBACK(bw_enable_filter), bw);
-    g_signal_connect(key_controller, "focus-out",
+    g_signal_connect(priv->sos_entry, "focus_out_event",
                      G_CALLBACK(bw_disable_filter), bw);
 
     button = gtk_button_new();