From 9cae4a9b61861dd760e40228d97369bd672ad648 Mon Sep 17 00:00:00 2001 From: lbonn Date: Mon, 11 Mar 2024 11:07:29 +0100 Subject: [Modes] Remove dead code in mode implems (#1960) NEXT, PREVIOUS and QUICK_SWITCH are handled in mode.c since 96cd34d24f7116c0fd37bf8571ee3ae79f9ad227 (#1184) --- source/modes/filebrowser.c | 16 ++-------------- source/modes/recursivebrowser.c | 16 ++-------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/source/modes/filebrowser.c b/source/modes/filebrowser.c index 47df4588..57791cf8 100644 --- a/source/modes/filebrowser.c +++ b/source/modes/filebrowser.c @@ -473,13 +473,7 @@ static ModeMode file_browser_mode_result(Mode *sw, int mretv, char **input, } gboolean special_command = ((mretv & MENU_CUSTOM_ACTION) == MENU_CUSTOM_ACTION); - if (mretv & MENU_NEXT) { - retv = NEXT_DIALOG; - } else if (mretv & MENU_PREVIOUS) { - retv = PREVIOUS_DIALOG; - } else if (mretv & MENU_QUICK_SWITCH) { - retv = (mretv & MENU_LOWER_MASK); - } else if (mretv & MENU_CUSTOM_COMMAND) { + if (mretv & MENU_CUSTOM_COMMAND) { retv = (mretv & MENU_LOWER_MASK); } else if ((mretv & MENU_OK)) { if (selected_line < pd->array_length) { @@ -657,13 +651,7 @@ ModeMode file_browser_mode_completer(Mode *sw, int mretv, char **input, ModeMode retv = MODE_EXIT; FileBrowserModePrivateData *pd = (FileBrowserModePrivateData *)mode_get_private_data(sw); - if (mretv & MENU_NEXT) { - retv = NEXT_DIALOG; - } else if (mretv & MENU_PREVIOUS) { - retv = PREVIOUS_DIALOG; - } else if (mretv & MENU_QUICK_SWITCH) { - retv = (mretv & MENU_LOWER_MASK); - } else if ((mretv & MENU_OK)) { + if ((mretv & MENU_OK)) { if (selected_line < pd->array_length) { if (pd->array[selected_line].type == UP) { GFile *new = g_file_get_parent(pd->current_dir); diff --git a/source/modes/recursivebrowser.c b/source/modes/recursivebrowser.c index 206fdf85..7cbd0f96 100644 --- a/source/modes/recursivebrowser.c +++ b/source/modes/recursivebrowser.c @@ -351,13 +351,7 @@ static ModeMode recursive_browser_mode_result(Mode *sw, int mretv, G_GNUC_UNUSED return MODE_EXIT; } - if (mretv & MENU_NEXT) { - retv = NEXT_DIALOG; - } else if (mretv & MENU_PREVIOUS) { - retv = PREVIOUS_DIALOG; - } else if (mretv & MENU_QUICK_SWITCH) { - retv = (mretv & MENU_LOWER_MASK); - } else if (mretv & MENU_CUSTOM_COMMAND) { + if (mretv & MENU_CUSTOM_COMMAND) { retv = (mretv & MENU_LOWER_MASK); } else if ((mretv & MENU_OK)) { if (selected_line < pd->array_length) { @@ -495,13 +489,7 @@ ModeMode recursive_browser_mode_completer(Mode *sw, int mretv, char **input, ModeMode retv = MODE_EXIT; FileBrowserModePrivateData *pd = (FileBrowserModePrivateData *)mode_get_private_data(sw); - if (mretv & MENU_NEXT) { - retv = NEXT_DIALOG; - } else if (mretv & MENU_PREVIOUS) { - retv = PREVIOUS_DIALOG; - } else if (mretv & MENU_QUICK_SWITCH) { - retv = (mretv & MENU_LOWER_MASK); - } else if ((mretv & MENU_OK)) { + if ((mretv & MENU_OK)) { if (selected_line < pd->array_length) { if (pd->array[selected_line].type == RFILE) { *path = g_strescape(pd->array[selected_line].path, NULL); -- cgit v1.2.3