mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 17:29:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename macro MC_SKINS_SUBDIR to MC_SKINS_DIR.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2020-05-03 12:17:49 +03:00
parent 246bdd63b4
commit 562889ce1e
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/fileloc.h
View File

@ -61,7 +61,8 @@
#define MC_TREESTORE_FILE "Tree" #define MC_TREESTORE_FILE "Tree"
#define MC_PANELS_FILE "panels.ini" #define MC_PANELS_FILE "panels.ini"
#define MC_FHL_INI_FILE "filehighlight.ini" #define MC_FHL_INI_FILE "filehighlight.ini"
#define MC_SKINS_SUBDIR "skins"
#define MC_SKINS_DIR "skins"
/* editor home directory */ /* editor home directory */
#define EDIT_HOME_DIR "mcedit" #define EDIT_HOME_DIR "mcedit"

2
lib/mcconfig/paths.c
View File

@ -76,7 +76,7 @@ static const struct
{ "", &mc_config_str, MC_FILEBIND_FILE }, { "", &mc_config_str, MC_FILEBIND_FILE },
/* data */ /* data */
{ "skins", &mc_data_str, MC_SKINS_SUBDIR }, { "skins", &mc_data_str, MC_SKINS_DIR },
{ "fish", &mc_data_str, FISH_PREFIX }, { "fish", &mc_data_str, FISH_PREFIX },
{ "ashrc", &mc_data_str, "ashrc" }, { "ashrc", &mc_data_str, "ashrc" },
{ "bashrc", &mc_data_str, "bashrc" }, { "bashrc", &mc_data_str, "bashrc" },

6
lib/skin/ini-file.c
View File

@ -52,7 +52,7 @@ mc_skin_get_list_from_dir (const gchar * base_dir, GPtrArray * list)
gchar *name; gchar *name;
GDir *dir; GDir *dir;
name = g_build_filename (base_dir, MC_SKINS_SUBDIR, (char *) NULL); name = g_build_filename (base_dir, MC_SKINS_DIR, (char *) NULL);
dir = g_dir_open (name, 0, NULL); dir = g_dir_open (name, 0, NULL);
g_free (name); g_free (name);
@ -101,7 +101,7 @@ mc_skin_ini_file_load_search_in_dir (mc_skin_t * mc_skin, const gchar * base_dir
{ {
char *file_name, *file_name2; char *file_name, *file_name2;
file_name = g_build_filename (base_dir, MC_SKINS_SUBDIR, mc_skin->name, (char *) NULL); file_name = g_build_filename (base_dir, MC_SKINS_DIR, mc_skin->name, (char *) NULL);
if (exist_file (file_name)) if (exist_file (file_name))
{ {
mc_skin->config = mc_config_init (file_name, TRUE); mc_skin->config = mc_config_init (file_name, TRUE);
@ -111,7 +111,7 @@ mc_skin_ini_file_load_search_in_dir (mc_skin_t * mc_skin, const gchar * base_dir
g_free (file_name); g_free (file_name);
file_name2 = g_strdup_printf ("%s.ini", mc_skin->name); file_name2 = g_strdup_printf ("%s.ini", mc_skin->name);
file_name = g_build_filename (base_dir, MC_SKINS_SUBDIR, file_name2, (char *) NULL); file_name = g_build_filename (base_dir, MC_SKINS_DIR, file_name2, (char *) NULL);
g_free (file_name2); g_free (file_name2);
if (exist_file (file_name)) if (exist_file (file_name))

2
src/textconf.c
View File

@ -225,7 +225,7 @@ show_datadirs_extended (void)
PRINTF_SECTION2 (_("Config directory:"), mc_config_get_path ()); PRINTF_SECTION2 (_("Config directory:"), mc_config_get_path ());
PRINTF_SECTION2 (_("Data directory:"), mc_config_get_data_path ()); PRINTF_SECTION2 (_("Data directory:"), mc_config_get_data_path ());
PRINTF ("skins:", mc_config_get_data_path (), MC_SKINS_SUBDIR PATH_SEP_STR); PRINTF ("skins:", mc_config_get_data_path (), MC_SKINS_DIR PATH_SEP_STR);
#ifdef ENABLE_VFS_EXTFS #ifdef ENABLE_VFS_EXTFS
PRINTF ("extfs.d:", mc_config_get_data_path (), MC_EXTFS_DIR PATH_SEP_STR); PRINTF ("extfs.d:", mc_config_get_data_path (), MC_EXTFS_DIR PATH_SEP_STR);
#endif #endif

2
tests/lib/mcconfig/user_configs_path.c
View File

@ -124,7 +124,7 @@ static const struct test_user_config_paths_ds
}, },
{ /* 9. */ { /* 9. */
CONF_DATA, CONF_DATA,
MC_SKINS_SUBDIR MC_SKINS_DIR
}, },
{ /* 10. */ { /* 10. */
CONF_DATA, CONF_DATA,