diff options
| -rwxr-xr-x | pluma/dialogs/pluma-close-confirmation-dialog.c | 2 | ||||
| -rwxr-xr-x | pluma/dialogs/pluma-close-confirmation-dialog.h | 2 | ||||
| -rw-r--r-- | pluma/pluma-dirs.c | 61 |
3 files changed, 8 insertions, 57 deletions
diff --git a/pluma/dialogs/pluma-close-confirmation-dialog.c b/pluma/dialogs/pluma-close-confirmation-dialog.c index ae430bf8..553b9f67 100755 --- a/pluma/dialogs/pluma-close-confirmation-dialog.c +++ b/pluma/dialogs/pluma-close-confirmation-dialog.c @@ -2,7 +2,7 @@ * pluma-close-confirmation-dialog.c * This file is part of pluma * - * Copyright (C) 2004-2005 MATE Foundation + * Copyright (C) 2004-2005 GNOME Foundation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/pluma/dialogs/pluma-close-confirmation-dialog.h b/pluma/dialogs/pluma-close-confirmation-dialog.h index da93bcb9..85d4dc4e 100755 --- a/pluma/dialogs/pluma-close-confirmation-dialog.h +++ b/pluma/dialogs/pluma-close-confirmation-dialog.h @@ -2,7 +2,7 @@ * pluma-close-confirmation-dialog.h * This file is part of pluma * - * Copyright (C) 2004-2005 MATE Foundation + * Copyright (C) 2004-2005 GNOME Foundation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/pluma/pluma-dirs.c b/pluma/pluma-dirs.c index fdeaa624..8c079cf0 100644 --- a/pluma/pluma-dirs.c +++ b/pluma/pluma-dirs.c @@ -35,23 +35,7 @@ gchar* pluma_dirs_get_user_config_dir(void) { gchar* config_dir = NULL; - #ifndef G_OS_WIN32 - const gchar* envvar; - - /* Support old libmate env var */ - envvar = g_getenv("MATE22_USER_DIR"); - - if (envvar != NULL) - { - config_dir = g_build_filename(envvar, "pluma", NULL); - } - else - { - config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL); - } - #else - config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL); - #endif + config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL); return config_dir; } @@ -67,13 +51,9 @@ gchar* pluma_dirs_get_user_cache_dir(void) gchar* pluma_dirs_get_user_plugins_dir(void) { - gchar* data_dir; gchar* plugin_dir; - data_dir = g_get_user_data_dir(); - - plugin_dir = g_build_filename(data_dir, "pluma", "plugins", NULL); - g_free(data_dir); + plugin_dir = g_build_filename(g_get_user_data_dir(), "pluma", "plugins", NULL); return plugin_dir; } @@ -81,41 +61,12 @@ gchar* pluma_dirs_get_user_plugins_dir(void) gchar* pluma_dirs_get_user_accels_file(void) { gchar* accels = NULL; + gchar *config_dir = NULL; - #ifndef G_OS_WIN32 - const gchar* envvar; - const gchar* config_dir; - - /* on linux accels are stored in .config/accels - * for historic reasons (backward compat with the - * old libmate that took care of saving them */ - - /* Support old libmate env var */ - envvar = g_getenv("MATE22_USER_DIR"); + config_dir = pluma_dirs_get_user_config_dir(); + accels = g_build_filename(config_dir, "accels", NULL); - if (envvar != NULL) - { - accels = g_build_filename(envvar, "accels", "pluma", NULL); - } - else - { - config_dir = pluma_dirs_get_user_config_dir(); - - if (config_dir != NULL) - { - accels = g_build_filename(config_dir, "accels", NULL); - } - } - #else - - gchar *config_dir = NULL; - - config_dir = pluma_dirs_get_user_config_dir(); - accels = g_build_filename(config_dir, "accels", "pluma", NULL); - - g_free(config_dir); - - #endif + g_free(config_dir); return accels; } |