From 45ec453b7615f59d327f4b4b8ba5c0fe9cdae0a5 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 12 Aug 2018 15:44:45 +0200 Subject: [PATCH] searchentry: Port bindings to use shortcuts --- gtk/gtksearchentry.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c index 535aaf946a..5d92aeebba 100644 --- a/gtk/gtksearchentry.c +++ b/gtk/gtksearchentry.c @@ -30,7 +30,6 @@ #include "gtksearchentryprivate.h" #include "gtkaccessible.h" -#include "gtkbindings.h" #include "gtkeditable.h" #include "gtkboxlayout.h" #include "gtkgestureclick.h" @@ -267,7 +266,6 @@ gtk_search_entry_class_init (GtkSearchEntryClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - GtkBindingSet *binding_set; object_class->finalize = gtk_search_entry_finalize; object_class->get_property = gtk_search_entry_get_property; @@ -401,14 +399,18 @@ gtk_search_entry_class_init (GtkSearchEntryClass *klass) NULL, G_TYPE_NONE, 0); - binding_set = gtk_binding_set_by_class (klass); - - gtk_binding_entry_add_signal (binding_set, GDK_KEY_g, GDK_CONTROL_MASK, - "next-match", 0); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK, - "previous-match", 0); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, - "stop-search", 0); + gtk_widget_class_add_binding_signal (widget_class, + GDK_KEY_g, GDK_CONTROL_MASK, + "next-match", + NULL); + gtk_widget_class_add_binding_signal (widget_class, + GDK_KEY_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + "previous-match", + NULL); + gtk_widget_class_add_binding_signal (widget_class, + GDK_KEY_Escape, 0, + "stop-search", + NULL); gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE); gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);