From 5e73f5a1f2e5a137166c08e5591979212f736286 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 26 Aug 2017 10:58:23 -0400 Subject: [PATCH] search bar: Use GdkEvent API --- gtk/gtksearchbar.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c index abbae64e89..b34b350de8 100644 --- a/gtk/gtksearchbar.c +++ b/gtk/gtksearchbar.c @@ -103,7 +103,11 @@ entry_key_pressed_event_cb (GtkWidget *widget, GdkEvent *event, GtkSearchBar *bar) { - if (event->key.keyval == GDK_KEY_Escape) + guint keyval; + + gdk_event_get_keyval (event, &keyval); + + if (keyval == GDK_KEY_Escape) { stop_search_cb (widget, bar); return GDK_EVENT_STOP; @@ -130,10 +134,14 @@ gtk_search_bar_handle_event_for_entry (GtkSearchBar *bar, guint preedit_change_id; gboolean res; char *old_text, *new_text; + guint keyval; + + gdk_event_get_keyval (event, &keyval); + if (gtk_search_entry_is_keynav_event (event) || - event->key.keyval == GDK_KEY_space || - event->key.keyval == GDK_KEY_Menu) + keyval == GDK_KEY_space || + keyval == GDK_KEY_Menu) return GDK_EVENT_PROPAGATE; if (!gtk_widget_get_realized (priv->entry))