summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <waker@users.sourceforge.net>2013-10-21 23:59:24 +0200
committerGravatar Alexey Yakovenko <waker@users.sourceforge.net>2013-10-21 23:59:24 +0200
commitd0bea217ae5f6da2a561b581b1d256f484563ce0 (patch)
tree5e5bacd6afd98c9f2ccfb3cad52503044664cbaa /plugins
parenta4d247b163c4ac22807b4fd3ea0f03987cf4246f (diff)
gtkui: fixed search window hotkey handler
Diffstat (limited to 'plugins')
-rw-r--r--plugins/gtkui/callbacks.h5
-rw-r--r--plugins/gtkui/deadbeef.glade2
-rw-r--r--plugins/gtkui/interface.c6
3 files changed, 9 insertions, 4 deletions
diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h
index 5b8f6b26..8cef5d47 100644
--- a/plugins/gtkui/callbacks.h
+++ b/plugins/gtkui/callbacks.h
@@ -1295,3 +1295,8 @@ on_hotkeys_actions_clicked (GtkButton *button,
void
on_hotkeys_defaults_clicked (GtkButton *button,
gpointer user_data);
+
+gboolean
+on_searchwin_key_press_event (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data);
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 3da7d3a5..33d986c4 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -959,10 +959,10 @@
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
- <signal name="key_press_event" handler="on_searchwin_key_press_event" last_modification_time="Sat, 08 Aug 2009 18:19:17 GMT"/>
<signal name="delete_event" handler="gtk_widget_hide_on_delete" last_modification_time="Sat, 08 Aug 2009 23:03:33 GMT"/>
<signal name="configure_event" handler="on_searchwin_configure_event" last_modification_time="Mon, 28 Dec 2009 19:24:44 GMT"/>
<signal name="window_state_event" handler="on_searchwin_window_state_event" last_modification_time="Mon, 28 Dec 2009 19:26:50 GMT"/>
+ <signal name="key_press_event" handler="on_searchwin_key_press_event" after="yes" last_modification_time="Mon, 21 Oct 2013 21:53:35 GMT"/>
<child>
<widget class="GtkVBox" id="vbox4">
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index 3c9d43aa..d2c133ae 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -845,9 +845,6 @@ create_searchwin (void)
gtk_widget_set_can_focus(searchlist, FALSE);
gtk_widget_set_can_default(searchlist, FALSE);
- g_signal_connect ((gpointer) searchwin, "key_press_event",
- G_CALLBACK (on_searchwin_key_press_event),
- NULL);
g_signal_connect ((gpointer) searchwin, "delete_event",
G_CALLBACK (gtk_widget_hide_on_delete),
NULL);
@@ -857,6 +854,9 @@ create_searchwin (void)
g_signal_connect ((gpointer) searchwin, "window_state_event",
G_CALLBACK (on_searchwin_window_state_event),
NULL);
+ g_signal_connect_after ((gpointer) searchwin, "key_press_event",
+ G_CALLBACK (on_searchwin_key_press_event),
+ NULL);
g_signal_connect ((gpointer) searchentry, "changed",
G_CALLBACK (on_searchentry_changed),
NULL);