summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntónio Fernandes <antoniof@gnome.org>2018-03-23 21:23:22 +0000
committerAntónio Fernandes <antoniof@gnome.org>2018-03-23 23:33:26 +0000
commit8580b6daca1f647785b4525efd711053c1370db5 (patch)
treef716265e319e75806e550c929c05a4ec33b2661d
parentb98fa17dfcbaab48517271cee12bae4707771a5a (diff)
downloadnautilus-8580b6daca1f647785b4525efd711053c1370db5.tar.gz
file: Ignore Desktop for default Downloads sorting
We no longer have a desktop view with manually sorted items, so there is no need to guard it against the case of both XDG_DESKTOP_DIR and XDG_DOWNLOAD_DIR being set to the same directory.
-rw-r--r--src/nautilus-file.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 1ed3c6f12..620a2f168 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -8952,7 +8952,7 @@ get_attributes_for_default_sort_type (NautilusFile *file,
gboolean *is_trash,
gboolean *is_search)
{
- gboolean is_recent_dir, is_download_dir, is_desktop_dir, is_trash_dir, is_search_dir, retval;
+ gboolean is_recent_dir, is_download_dir, is_trash_dir, is_search_dir, retval;
*is_recent = FALSE;
*is_download = FALSE;
@@ -8967,14 +8967,12 @@ get_attributes_for_default_sort_type (NautilusFile *file,
nautilus_file_is_in_recent (file);
is_download_dir =
nautilus_file_is_user_special_directory (file, G_USER_DIRECTORY_DOWNLOAD);
- is_desktop_dir =
- nautilus_file_is_user_special_directory (file, G_USER_DIRECTORY_DESKTOP);
is_trash_dir =
nautilus_file_is_in_trash (file);
is_search_dir =
nautilus_file_is_in_search (file);
- if (is_download_dir && !is_desktop_dir)
+ if (is_download_dir)
{
*is_download = TRUE;
retval = TRUE;