[gnome-commander/get_rid_of_xml] If search or dir history should not be stored save default value in gsettings
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/get_rid_of_xml] If search or dir history should not be stored save default value in gsettings
- Date: Mon, 14 Jan 2019 21:56:02 +0000 (UTC)
commit eae211abdd360f72cc7870fd1fe1ac34b6bbe16c
Author: Uwe Scholz <u scholz83 gmx de>
Date: Mon Jan 14 22:55:11 2019 +0100
If search or dir history should not be stored save default value in gsettings
src/gnome-cmd-data.cc | 49 +++++++++++++++++++++++++++++++------------------
1 file changed, 31 insertions(+), 18 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 62ab9138..2a5ce559 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -2677,30 +2677,43 @@ void GnomeCmdData::save_cmdline_history()
void GnomeCmdData::save_directory_history()
{
- if (!options.save_dir_history_on_exit)
- return;
-
- set_gsettings_string_array_from_glist(
- options.gcmd_settings->general,
- GCMD_SETTINGS_DIRECTORY_HISTORY,
- gnome_cmd_con_get_dir_history (priv->con_list->get_home())->ents);
+ if (options.save_dir_history_on_exit)
+ {
+ set_gsettings_string_array_from_glist(
+ options.gcmd_settings->general,
+ GCMD_SETTINGS_DIRECTORY_HISTORY,
+ gnome_cmd_con_get_dir_history (priv->con_list->get_home())->ents);
+ }
+ else
+ {
+ GVariant* dirHistoryToStore = g_settings_get_default_value (options.gcmd_settings->general,
GCMD_SETTINGS_DIRECTORY_HISTORY);
+ g_settings_set_value(options.gcmd_settings->general, GCMD_SETTINGS_DIRECTORY_HISTORY,
dirHistoryToStore);
+ }
}
void GnomeCmdData::save_search_history()
{
- if (!gnome_cmd_data.options.save_search_history_on_exit)
- return;
-
- set_gsettings_string_array_from_glist(
- options.gcmd_settings->general,
- GCMD_SETTINGS_SEARCH_PATTERN_HISTORY,
- search_defaults.name_patterns.ents);
+ if (gnome_cmd_data.options.save_search_history_on_exit)
+ {
+ set_gsettings_string_array_from_glist(
+ 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);
+ }
+ else
+ {
+ GVariant* searchHistoryToStore = g_settings_get_default_value (options.gcmd_settings->general,
GCMD_SETTINGS_SEARCH_PATTERN_HISTORY);
+ g_settings_set_value(options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_PATTERN_HISTORY,
searchHistoryToStore);
- set_gsettings_string_array_from_glist(
- options.gcmd_settings->general,
- GCMD_SETTINGS_SEARCH_TEXT_HISTORY,
- search_defaults.content_patterns.ents);
+ searchHistoryToStore = g_settings_get_default_value (options.gcmd_settings->general,
GCMD_SETTINGS_SEARCH_TEXT_HISTORY);
+ g_settings_set_value(options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_TEXT_HISTORY,
searchHistoryToStore);
+ }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]