summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-04-18 11:09:51 +0300
committermonsta <[email protected]>2017-04-18 11:13:15 +0300
commit4a8a1305182690761993f3a86d6b72b3729fbb75 (patch)
tree511acc397585f00833b1aaa9cd8b3edc9c36ac8d
parentd1eebd2027ec67e30c01105d8081d9de4dd6cfe1 (diff)
downloadcaja-4a8a1305182690761993f3a86d6b72b3729fbb75.tar.bz2
caja-4a8a1305182690761993f3a86d6b72b3729fbb75.tar.xz
don't check nonexistent ~/.mate2 directory
it's probably some leftover from excessive gnome -> mate renaming back in 2011. even if it ever existed, we can drop it now, like upstream did for ~/.gnome2: https://git.gnome.org/browse/nautilus/commit/?id=5c17044597c980bdbe77a4894d92150fbe69909c
-rw-r--r--libcaja-private/caja-file-utilities.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c
index 41f80c29..aba9cf83 100644
--- a/libcaja-private/caja-file-utilities.c
+++ b/libcaja-private/caja-file-utilities.c
@@ -1059,14 +1059,13 @@ caja_uninhibit_power_manager (gint cookie)
g_variant_unref (result);
}
-/* Returns TRUE if the file is in XDG_DATA_DIRS or
- in "~/.mate2/". This is used for deciding
- if a desktop file is "trusted" based on the path */
+/* Returns TRUE if the file is in XDG_DATA_DIRS. This is used for
+ deciding if a desktop file is "trusted" based on the path */
gboolean
caja_is_in_system_dir (GFile *file)
{
const char * const * data_dirs;
- char *path, *mate2;
+ char *path;
int i;
gboolean res;
@@ -1090,18 +1089,6 @@ caja_is_in_system_dir (GFile *file)
}
- if (!res)
- {
- /* Panel desktop files are here, trust them */
- mate2 = g_build_filename(g_get_home_dir(), ".mate2", NULL);
-
- if (g_str_has_prefix (path, mate2))
- {
- res = TRUE;
- }
-
- g_free(mate2);
- }
g_free (path);
return res;