From 306b30ed301391d3d402bf022a58648ed5544123 Mon Sep 17 00:00:00 2001 From: Mooffie Date: Thu, 8 Sep 2016 14:22:39 +0300 Subject: [PATCH] Ticket #3687: store the 'hotlist' file in data dir, not config dir. Signed-off-by: Andrew Borodin --- lib/mcconfig/paths.c | 4 +++- tests/lib/mcconfig/user_configs_path.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c index cccdf8b39..33990b615 100644 --- a/lib/mcconfig/paths.c +++ b/lib/mcconfig/paths.c @@ -65,7 +65,6 @@ static const struct /* config */ { "ini", &mc_config_str, MC_CONFIG_FILE}, { "filehighlight.ini", &mc_config_str, MC_FHL_INI_FILE}, - { "hotlist", &mc_config_str, MC_HOTLIST_FILE}, { "mc.keymap", &mc_config_str, GLOBAL_KEYMAP_FILE}, { "menu", &mc_config_str, MC_USERMENU_FILE}, { "cedit" PATH_SEP_STR "Syntax", &mc_config_str, EDIT_SYNTAX_FILE}, @@ -86,6 +85,7 @@ static const struct { "extfs.d", &mc_data_str, MC_EXTFS_DIR}, { "history", &mc_data_str, MC_HISTORY_FILE}, { "filepos", &mc_data_str, MC_FILEPOS_FILE}, + { "hotlist", &mc_data_str, MC_HOTLIST_FILE}, { "cedit" PATH_SEP_STR "cooledit.clip", &mc_data_str, EDIT_CLIP_FILE}, { "", &mc_data_str, MC_MACRO_FILE}, @@ -109,6 +109,8 @@ static const struct } mc_config_migrate_rules_fix[] = { /* *INDENT-OFF* */ + { &mc_config_str, MC_HOTLIST_FILE, &mc_data_str}, + { &mc_data_str, MC_USERMENU_FILE, &mc_config_str}, { &mc_data_str, EDIT_SYNTAX_FILE, &mc_config_str}, { &mc_data_str, EDIT_HOME_MENU, &mc_config_str}, diff --git a/tests/lib/mcconfig/user_configs_path.c b/tests/lib/mcconfig/user_configs_path.c index c56a7d893..b0a59e542 100644 --- a/tests/lib/mcconfig/user_configs_path.c +++ b/tests/lib/mcconfig/user_configs_path.c @@ -93,7 +93,7 @@ static const struct test_user_config_paths_ds MC_FHL_INI_FILE }, { /* 2. */ - CONF_MAIN, + CONF_DATA, MC_HOTLIST_FILE }, { /* 3. */ -- 2.11.4.GIT