[gnome-commander/remove-search: 3/3] noop: Methods renamed

[Uwe Scholz <uwescholz src gnome org>]

commit 98d891f512ba65f3b275589ad73a2d506920b71f
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Wed Jan 12 19:54:38 2022 +0100

    noop: Methods renamed

 src/gnome-cmd-main-menu.cc    |  4 ++--
 src/gnome-cmd-main-win.cc     |  2 +-
 src/gnome-cmd-user-actions.cc | 34 +++++++++++++++++-----------------
 src/gnome-cmd-user-actions.h  |  4 ++--
 4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/gnome-cmd-main-menu.cc b/src/gnome-cmd-main-menu.cc
index 5bc3fbf6..b1f4cb8e 100644
--- a/src/gnome-cmd-main-menu.cc
+++ b/src/gnome-cmd-main-menu.cc
@@ -307,8 +307,8 @@ static GtkUIManager *get_file_menu_ui_manager()
         { "AdvRenameTool",      nullptr, _("Advanced _Rename Tool"),      "<Control>M", nullptr, (GCallback) 
file_advrename },
         { "CreateSymLink",      nullptr, _("Create _Symbolic Link"),      "<Control><shift>F5", nullptr, 
(GCallback) file_create_symlink },
         { "OpenFileProperties", GTK_STOCK_PROPERTIES, _("_Properties…"),  "<Alt>KP_Enter", nullptr, 
(GCallback) file_properties },
-        { "Search",             GTK_STOCK_FIND, _("_Search…"),            "<Alt>F7", nullptr, (GCallback) 
edit_search },
-        { "QuickSearch",        GTK_STOCK_FIND, _("_Quick Search…"),      nullptr, nullptr, (GCallback) 
edit_quick_search },
+        { "Search",             GTK_STOCK_FIND, _("_Search…"),            "<Alt>F7", nullptr, (GCallback) 
file_search },
+        { "QuickSearch",        GTK_STOCK_FIND, _("_Quick Search…"),      nullptr, nullptr, (GCallback) 
file_quick_search },
         { "EnableFilter",       GTK_STOCK_CLEAR, _("_Enable Filter…"),    nullptr, nullptr, (GCallback) 
edit_filter },
         { "Diff",               nullptr, _("_Diff"),                      nullptr, nullptr, (GCallback) 
file_diff },
         { "SyncDirs",           nullptr, _("S_ynchronize Directories"),   nullptr, nullptr, (GCallback) 
file_sync_dirs },
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index 47ed729d..5c48ff05 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -479,7 +479,7 @@ static void on_delete_clicked (GtkButton *button, GnomeCmdMainWin *mw)
 
 static void on_search_clicked (GtkButton *button, GnomeCmdMainWin *mw)
 {
-    edit_search (NULL);
+    file_search (NULL);
 }
 
 
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 1ac6ff07..afbeff76 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -213,8 +213,8 @@ static UserActionData user_actions_data[] = {
                                              {file_delete, "edit.delete", N_("Delete")},
                                              {edit_filter, "edit.filter", N_("Show user defined files")},
                                              {edit_cap_paste, "edit.paste", N_("Paste")},
-                                             {edit_quick_search, "edit.quick_search", N_("Quick search")},
-                                             {edit_search, "edit.search", N_("Search")},
+                                             {file_quick_search, "file.quick_search", N_("Quick search")},
+                                             {file_search, "file.search", N_("Search")},
                                              {file_advrename, "file.advrename", N_("Advanced rename tool")},
                                              {file_chmod, "file.chmod", N_("Change permissions")},
                                              {file_chown, "file.chown", N_("Change owner/group")},
@@ -771,6 +771,21 @@ void file_edit_new_doc (GtkMenuItem *menuitem, gpointer not_used)
 }
 
 
+void file_search (GtkMenuItem *menuitem, gpointer not_used)
+{
+    if (!main_win->file_search_dlg)
+        main_win->file_search_dlg = new GnomeCmdSearchDialog(gnome_cmd_data.search_defaults);
+
+    main_win->file_search_dlg->show_and_set_focus();
+}
+
+
+void file_quick_search (GtkMenuItem *menuitem, gpointer not_used)
+{
+    gnome_cmd_file_list_show_quicksearch (get_fl (ACTIVE), 0);
+}
+
+
 void file_chmod (GtkMenuItem *menuitem, gpointer not_used)
 {
     GList *files = get_fl (ACTIVE)->get_selected_files();
@@ -1066,21 +1081,6 @@ void edit_cap_paste (GtkMenuItem *menuitem, gpointer not_used)
 }
 
 
-void edit_search (GtkMenuItem *menuitem, gpointer not_used)
-{
-    if (!main_win->file_search_dlg)
-        main_win->file_search_dlg = new GnomeCmdSearchDialog(gnome_cmd_data.search_defaults);
-
-    main_win->file_search_dlg->show_and_set_focus();
-}
-
-
-void edit_quick_search (GtkMenuItem *menuitem, gpointer not_used)
-{
-    gnome_cmd_file_list_show_quicksearch (get_fl (ACTIVE), 0);
-}
-
-
 void edit_filter (GtkMenuItem *menuitem, gpointer not_used)
 {
     get_fs (ACTIVE)->show_filter();
diff --git a/src/gnome-cmd-user-actions.h b/src/gnome-cmd-user-actions.h
index 002d6013..e75bedf0 100644
--- a/src/gnome-cmd-user-actions.h
+++ b/src/gnome-cmd-user-actions.h
@@ -234,6 +234,8 @@ GNOME_CMD_USER_ACTION(file_internal_view);
 GNOME_CMD_USER_ACTION(file_external_view);
 GNOME_CMD_USER_ACTION(file_edit);
 GNOME_CMD_USER_ACTION(file_edit_new_doc);
+GNOME_CMD_USER_ACTION(file_search);
+GNOME_CMD_USER_ACTION(file_quick_search);
 GNOME_CMD_USER_ACTION(file_chmod);
 GNOME_CMD_USER_ACTION(file_chown);
 GNOME_CMD_USER_ACTION(file_mkdir);
@@ -267,8 +269,6 @@ GNOME_CMD_USER_ACTION(mark_compare_directories);
 GNOME_CMD_USER_ACTION(edit_cap_cut);
 GNOME_CMD_USER_ACTION(edit_cap_copy);
 GNOME_CMD_USER_ACTION(edit_cap_paste);
-GNOME_CMD_USER_ACTION(edit_search);
-GNOME_CMD_USER_ACTION(edit_quick_search);
 GNOME_CMD_USER_ACTION(edit_filter);
 GNOME_CMD_USER_ACTION(edit_copy_fnames);