wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

plumadirs: Cleanup config dir usage 

Remove backwards compatibility for < glib 2.6 as we require glib 2.22 at
a minimum now.
Use g_get_user_config_dir instead of custom logic.
Use pluma_dirs_get_user_config_dir in pluma_dirs_get_user_accels_file.
This commit is contained in:
infirit 2014-01-16 00:34:56 +01:00
parent 2adb637a2e
commit 2cfd8639d0
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pluma/pluma-dirs.c
View File

@ -37,7 +37,6 @@ gchar* pluma_dirs_get_user_config_dir(void)
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
const gchar* envvar; const gchar* envvar;
const gchar* home;
/* Support old libmate env var */ /* Support old libmate env var */
envvar = g_getenv("MATE22_USER_DIR"); envvar = g_getenv("MATE22_USER_DIR");
@ -48,19 +47,10 @@ gchar* pluma_dirs_get_user_config_dir(void)
} }
else else
{ {
home = g_get_home_dir(); config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL);
if (home != NULL)
{
config_dir = g_build_filename(home, ".config", "pluma", NULL);
}
} }
#else #else
#if GLIB_CHECK_VERSION(2, 6, 0)
config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL); config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL);
#else // glib version < 2.6.0
config_dir = g_build_filename(g_get_home_dir(), ".config", "pluma", NULL);
#endif
#endif #endif
return config_dir; return config_dir;
@ -94,7 +84,7 @@ gchar* pluma_dirs_get_user_accels_file(void)
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
const gchar* envvar; const gchar* envvar;
const gchar* home; const gchar* config_dir;
/* on linux accels are stored in .config/accels /* on linux accels are stored in .config/accels
* for historic reasons (backward compat with the * for historic reasons (backward compat with the
@ -109,11 +99,11 @@ gchar* pluma_dirs_get_user_accels_file(void)
} }
else else
{ {
home = g_get_home_dir(); config_dir = pluma_dirs_get_user_config_dir();
if (home != NULL) if (config_dir != NULL)
{ {
accels = g_build_filename(home, ".config", "accels", "pluma", NULL); accels = g_build_filename(config_dir, "accels", "pluma", NULL);
} }
} }
#else #else