[gnome-commander] Remove deprecated code for storing search history of the internal file search tool
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Remove deprecated code for storing search history of the internal file search tool
- Date: Sat, 15 Jan 2022 23:07:08 +0000 (UTC)
commit 84cd7885ed3a65314d19dc3e4701df8b5c7827a5
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sun Jan 16 00:04:49 2022 +0100
Remove deprecated code for storing search history of the internal file search tool
data/org.gnome.gnome-commander.gschema.xml | 7 -------
src/gnome-cmd-data.cc | 6 ------
src/gnome-cmd-data.h | 3 ---
src/gnome-cmd-selection-profile-component.cc | 1 -
4 files changed, 17 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 111c1172..029f1982 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -514,13 +514,6 @@
The entries in this list represent the favorite apps configured by the user.
</description>
</key>
- <key name="search-text-history" type="as">
- <default>[]</default>
- <summary>Search text history</summary>
- <description>
- This string array represents the history of text searches in the search tool.
- </description>
- </key>
<key name="search-pattern-history" type="as">
<default>[]</default>
<summary>Search pattern history</summary>
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 6212fe8d..0b3bf7ae 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -2576,11 +2576,6 @@ void GnomeCmdData::save_search_history()
options.gcmd_settings->general,
GCMD_SETTINGS_SEARCH_PATTERN_HISTORY,
search_defaults.name_patterns.ents);
-
- set_gsettings_string_array_from_glist(
- options.gcmd_settings->general,
- GCMD_SETTINGS_SEARCH_TEXT_HISTORY,
- search_defaults.content_patterns.ents);
}
@@ -3216,7 +3211,6 @@ void GnomeCmdData::load()
options.save_tabs_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_TABS_ON_EXIT);
options.save_dir_history_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_DIR_HISTORY_ON_EXIT);
options.save_cmdline_history_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_CMDLINE_HISTORY_ON_EXIT);
- search_defaults.content_patterns.ents = get_list_from_gsettings_string_array
(options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_TEXT_HISTORY);
search_defaults.name_patterns.ents = get_list_from_gsettings_string_array
(options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_PATTERN_HISTORY);
bookmarks_defaults.width = g_settings_get_uint(options.gcmd_settings->general,
GCMD_SETTINGS_BOOKMARKS_WINDOW_WIDTH);
bookmarks_defaults.height = g_settings_get_uint(options.gcmd_settings->general,
GCMD_SETTINGS_BOOKMARKS_WINDOW_HEIGHT);
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 6e112f84..db38cbad 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -128,7 +128,6 @@ GcmdSettings *gcmd_settings_new (void);
#define GCMD_SETTINGS_FAV_APPS_FORMAT_STRING "(ssssubbb)"
#define GCMD_SETTINGS_DIRECTORY_HISTORY "directory-history"
#define GCMD_SETTINGS_SEARCH_PATTERN_HISTORY "search-pattern-history"
-#define GCMD_SETTINGS_SEARCH_TEXT_HISTORY "search-text-history"
#define GCMD_SETTINGS_SEARCH_PROFILES "search-profiles"
#define GCMD_SETTINGS_SEARCH_PROFILE_FORMAT_STRING "(siisbbs)"
#define GCMD_SETTINGS_SEARCH_PROFILES_FORMAT_STRING "a(siisbbs)"
@@ -578,13 +577,11 @@ struct GnomeCmdData
SearchProfile default_profile;
History name_patterns;
- History content_patterns;
std::vector<SearchProfile> &profiles;
explicit SearchConfig(std::vector<SearchProfile> &searchProfiles):
name_patterns(SEARCH_HISTORY_SIZE),
- content_patterns(SEARCH_HISTORY_SIZE),
profiles(searchProfiles)
{
default_profile.name = "Default";
diff --git a/src/gnome-cmd-selection-profile-component.cc b/src/gnome-cmd-selection-profile-component.cc
index ccf42ae9..e48b0701 100644
--- a/src/gnome-cmd-selection-profile-component.cc
+++ b/src/gnome-cmd-selection-profile-component.cc
@@ -213,7 +213,6 @@ GnomeCmdSelectionProfileComponent::GnomeCmdSelectionProfileComponent(GnomeCmdDat
void GnomeCmdSelectionProfileComponent::update()
{
set_name_patterns_history(gnome_cmd_data.search_defaults.name_patterns.ents);
- set_content_patterns_history(gnome_cmd_data.search_defaults.content_patterns.ents);
gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->pattern_combo))),
profile.filename_pattern.c_str());
gtk_combo_box_set_active (GTK_COMBO_BOX (priv->filter_type_combo), (int) profile.syntax);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]