diff options
| author | monsta <[email protected]> | 2017-04-18 11:19:51 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2017-04-18 11:19:51 +0300 |
| commit | ed842baac4f438a90bd6214020d2363241171545 (patch) | |
| tree | b6c53a05b67ee00e489ac7a4d7d976bd6e6803a9 | |
| parent | 4a8a1305182690761993f3a86d6b72b3729fbb75 (diff) | |
| download | caja-ed842baac4f438a90bd6214020d2363241171545.tar.bz2 caja-ed842baac4f438a90bd6214020d2363241171545.tar.xz | |
don't check nonexistent MATE22_USER_DIR env var
another case of excessive gnome -> mate renaming back in 2011
| -rw-r--r-- | libcaja-private/caja-file-utilities.c | 15 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 11 |
2 files changed, 3 insertions, 23 deletions
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c index aba9cf83..237f85d7 100644 --- a/libcaja-private/caja-file-utilities.c +++ b/libcaja-private/caja-file-utilities.c @@ -172,22 +172,11 @@ char* caja_get_user_directory(void) * Get the path for the filename containing caja accelerator map. * The filename need not exist. * - * Return value: the filename path, or NULL if the home directory could not be found + * Return value: the filename path **/ char* caja_get_accel_map_file(void) { - const gchar* override; - - override = g_getenv ("MATE22_USER_DIR"); - - if (override) - { - return g_build_filename(override, "accels", "caja", NULL); - } - else - { - return g_build_filename(g_get_user_config_dir(), "caja", "accels", NULL); - } + return g_build_filename (g_get_user_config_dir (), "caja", "accels", NULL); } typedef struct { diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 16a53780..c37da477 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1657,16 +1657,7 @@ static void set_up_scripts_directory_global(void) } char* scripts_directory_path; - const char* override = g_getenv ("MATE22_USER_DIR"); //TODO: remove? - - if (override) - { - scripts_directory_path = g_build_filename(override, "caja", "scripts", NULL); - } - else - { - scripts_directory_path = g_build_filename(g_get_user_config_dir(), "caja", "scripts", NULL); - } + scripts_directory_path = g_build_filename (g_get_user_config_dir (), "caja", "scripts", NULL); if (g_mkdir_with_parents(scripts_directory_path, 0755) == 0) { |