diff options
| -rw-r--r-- | plugins/gtkui/ddblistview.c | 3 | ||||
| -rw-r--r-- | plugins/gtkui/hotkeys.c | 4 | ||||
| -rw-r--r-- | plugins/gtkui/search.c | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c index 51e2159c..e590152b 100644 --- a/plugins/gtkui/ddblistview.c +++ b/plugins/gtkui/ddblistview.c @@ -32,6 +32,7 @@ #include "drawing.h" #include "gtkui.h" #include "support.h" +#include "actionhandlers.h" #define min(x,y) ((x)<(y)?(x):(y)) #define max(x,y) ((x)>(y)?(x):(y)) @@ -1949,7 +1950,7 @@ ddb_listview_handle_keypress (DdbListview *ps, int keyval, int state) { state &= (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK); if (state & ~GDK_SHIFT_MASK) { - return 0; + return FALSE; } if (keyval == GDK_Down) { diff --git a/plugins/gtkui/hotkeys.c b/plugins/gtkui/hotkeys.c index e3e53736..56b98574 100644 --- a/plugins/gtkui/hotkeys.c +++ b/plugins/gtkui/hotkeys.c @@ -884,6 +884,8 @@ on_hotkeys_defaults_clicked (GtkButton *button, return; } gtkui_set_default_hotkeys (); + hotkeys_load (); + gtkui_hotkeys_changed = 0; } void @@ -921,7 +923,5 @@ gtkui_set_default_hotkeys (void) { deadbeef->conf_set_str ("hotkey.key30", "b 0 0 next"); deadbeef->conf_set_str ("hotkey.key31", "n 0 0 playback_random"); deadbeef->conf_save (); - hotkeys_load (); - gtkui_hotkeys_changed = 0; } diff --git a/plugins/gtkui/search.c b/plugins/gtkui/search.c index 57d52071..b6572aac 100644 --- a/plugins/gtkui/search.c +++ b/plugins/gtkui/search.c @@ -189,12 +189,9 @@ on_searchwin_key_press_event (GtkWidget *widget, else if (event->keyval != GDK_Delete && event->keyval != GDK_Home && event->keyval != GDK_End){ GtkWidget *pl = lookup_widget (searchwin, "searchlist"); if (!ddb_listview_handle_keypress (DDB_LISTVIEW (pl), event->keyval, event->state)) { - return FALSE; + return on_mainwin_key_press_event (widget, event, user_data); } } - else { - return FALSE; - } return TRUE; } |