Rename macro MC_SKINS_SUBDIR to MC_SKINS_DIR.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/fileloc.h

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

lib/mcconfig/paths.c

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

lib/skin/ini-file.c

@@ -52,7 +52,7 @@ mc_skin_get_list_from_dir (const gchar * base_dir, GPtrArray * list)
     gchar *name;
     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);
     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;
 
-    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))
     {
         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);
 
     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);
 
     if (exist_file (file_name))

src/textconf.c

@@ -225,7 +225,7 @@ show_datadirs_extended (void)
 
     PRINTF_SECTION2 (_("Config directory:"), mc_config_get_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
     PRINTF ("extfs.d:", mc_config_get_data_path (), MC_EXTFS_DIR PATH_SEP_STR);
 #endif

tests/lib/mcconfig/user_configs_path.c

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