diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-17 03:20:49 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-17 03:20:49 -0800 |
| commit | 587c11cec26ce75132573106b9a2dd2759621bc9 (patch) | |
| tree | dac9d3fcdd5c0fdb64c085bc32ab8b2a3917476e | |
| parent | 90e4a3c917b32d49c5e963a99cea131d5e3992fc (diff) | |
| parent | 86369deb93ae28e39ef59d462fb6693747cb332f (diff) | |
| download | pluma-587c11cec26ce75132573106b9a2dd2759621bc9.tar.bz2 pluma-587c11cec26ce75132573106b9a2dd2759621bc9.tar.xz | |
Merge pull request #55 from infirit/pluma-dirs
Move plugins to data_dir, fix accel file location and minor cleanup
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | pluma/pluma-dirs.c | 30 |
2 files changed, 19 insertions, 21 deletions
@@ -1,3 +1,11 @@ +pluma 1.7.1 +=========== + + * Move user plugin dir from config_dir to data_dir. Plugins should have + never been installed in the config dir as they are not part of the + configuration. This means user will need to move the plugins directory + from: $HOME/.config/pluma/ to $HOME/.local/share/pluma/. + pluma 1.5.0 =========== @@ -5,4 +13,4 @@ pluma 1.5.0 (All code is migrated, except pythonconsole plugin. The plugin works, except you cant configure it; the configurable things were command and error colors; this will be fixed migrating the plugin to Gir - instead of python-gtk)
\ No newline at end of file + instead of python-gtk) diff --git a/pluma/pluma-dirs.c b/pluma/pluma-dirs.c index 7c7c05dd..fdeaa624 100644 --- a/pluma/pluma-dirs.c +++ b/pluma/pluma-dirs.c @@ -37,7 +37,6 @@ gchar* pluma_dirs_get_user_config_dir(void) #ifndef G_OS_WIN32 const gchar* envvar; - const gchar* home; /* Support old libmate env var */ envvar = g_getenv("MATE22_USER_DIR"); @@ -48,19 +47,10 @@ gchar* pluma_dirs_get_user_config_dir(void) } else { - home = g_get_home_dir(); - - if (home != NULL) - { - config_dir = g_build_filename(home, ".config", "pluma", NULL); - } + config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL); } #else - #if GLIB_CHECK_VERSION(2, 6, 0) - 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 + config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL); #endif return config_dir; @@ -77,13 +67,13 @@ gchar* pluma_dirs_get_user_cache_dir(void) gchar* pluma_dirs_get_user_plugins_dir(void) { - gchar* config_dir; + gchar* data_dir; gchar* plugin_dir; - config_dir = pluma_dirs_get_user_config_dir(); + data_dir = g_get_user_data_dir(); - plugin_dir = g_build_filename(config_dir, "plugins", NULL); - g_free(config_dir); + plugin_dir = g_build_filename(data_dir, "pluma", "plugins", NULL); + g_free(data_dir); return plugin_dir; } @@ -94,7 +84,7 @@ gchar* pluma_dirs_get_user_accels_file(void) #ifndef G_OS_WIN32 const gchar* envvar; - const gchar* home; + const gchar* config_dir; /* on linux accels are stored in .config/accels * for historic reasons (backward compat with the @@ -109,11 +99,11 @@ gchar* pluma_dirs_get_user_accels_file(void) } 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", NULL); } } #else |