Replace variable: global_profile_name -> mc_global_t::profile_name.

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

lib/global.c

@@ -60,6 +60,8 @@ mc_global_t mc_global =
     .sysconfig_dir = NULL,
     .share_data_dir = NULL,
 
+    .profile_name = NULL,
+
 #ifdef HAVE_CHARSET
     .source_codepage = -1,
     .display_codepage = -1,

lib/global.h

@@ -171,6 +171,8 @@ typedef struct
     /* share_data_dir: Area for default settings from developers */
     char *share_data_dir;
 
+    char *profile_name;
+
     mc_config_t *main_config;
     mc_config_t *panels_config;
 

src/execute.c

@@ -240,7 +240,7 @@ execute_get_opts_from_cfg (const char *command, const char *default_str)
     {
         mc_config_t *cfg;
 
-        cfg = mc_config_init (global_profile_name, TRUE);
+        cfg = mc_config_init (mc_global.profile_name, TRUE);
         if (cfg == NULL)
             return g_strdup (default_str);
 

src/filemanager/treestore.c

@@ -570,7 +570,7 @@ should_skip_directory (const vfs_path_t * vpath)
 
         profile_name = setup_init ();
         process_special_dirs (&special_dirs, profile_name);
-        process_special_dirs (&special_dirs, global_profile_name);
+        process_special_dirs (&special_dirs, mc_global.profile_name);
 
         loaded = TRUE;
     }

src/setup.c

@@ -78,8 +78,6 @@
 
 /*** global variables ****************************************************************************/
 
-char *global_profile_name;      /* mc.lib */
-
 /* Only used at program boot */
 gboolean boot_current_is_left = TRUE;
 
@@ -872,12 +870,12 @@ load_setup (void)
 
     /* mc.lib is common for all users, but has priority lower than
        ${XDG_CONFIG_HOME}/mc/ini.  FIXME: it's only used for keys and treestore now */
-    global_profile_name =
+    mc_global.profile_name =
         g_build_filename (mc_global.sysconfig_dir, MC_GLOBAL_CONFIG_FILE, (char *) NULL);
-    if (!exist_file (global_profile_name))
+    if (!exist_file (mc_global.profile_name))
     {
-        g_free (global_profile_name);
-        global_profile_name =
+        g_free (mc_global.profile_name);
+        mc_global.profile_name =
             g_build_filename (mc_global.share_data_dir, MC_GLOBAL_CONFIG_FILE, (char *) NULL);
     }
 
@@ -1039,7 +1037,7 @@ done_setup (void)
 
     g_free (clipboard_store_path);
     g_free (clipboard_paste_path);
-    g_free (global_profile_name);
+    g_free (mc_global.profile_name);
     g_free (mc_global.tty.color_terminal_string);
     g_free (mc_global.tty.term_color_string);
     g_free (mc_global.tty.setup_color_string);
@@ -1093,7 +1091,7 @@ load_key_defs (void)
      */
     mc_config_t *mc_global_config;
 
-    mc_global_config = mc_config_init (global_profile_name, FALSE);
+    mc_global_config = mc_config_init (mc_global.profile_name, FALSE);
     if (mc_global_config != NULL)
     {
         load_keys_from_section ("general", mc_global_config);

src/setup.h

@@ -74,7 +74,6 @@ struct mc_fhl_struct;
 /*** global variables defined in .c file *********************************************************/
 
 /* global parameters */
-extern char *global_profile_name;
 extern gboolean confirm_delete;
 extern gboolean confirm_directory_hotlist_delete;
 extern gboolean confirm_execute;