summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2015-09-03 12:23:05 +0200
committerCarlos Soriano <csoriano@gnome.org>2015-09-03 16:18:13 +0200
commitcd0d78a6b5bcfc977e2921278487aeef44f94512 (patch)
treec05458cfaed692444e510d394c86cfd5430c5f71
parent1ed9a63b644eeaba6b3605d880f39bc37eaecae6 (diff)
downloadnautilus-cd0d78a6b5bcfc977e2921278487aeef44f94512.tar.gz
window-slot: don't invalidate when force reload
Some directory types like the desktop even request explicitly to do not so, and other like the vfs already invalidate all attributes. So let the directory type itself to whatever is necessary to invalidate its file.
-rw-r--r--libnautilus-private/nautilus-search-directory.c5
-rw-r--r--src/nautilus-window-slot.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
index d50c418ec..86cf2bf4e 100644
--- a/libnautilus-private/nautilus-search-directory.c
+++ b/libnautilus-private/nautilus-search-directory.c
@@ -636,6 +636,7 @@ static void
search_force_reload (NautilusDirectory *directory)
{
NautilusSearchDirectory *search;
+ NautilusFile *file;
search = NAUTILUS_SEARCH_DIRECTORY (directory);
@@ -648,6 +649,10 @@ search_force_reload (NautilusDirectory *directory)
/* Remove file monitors */
reset_file_list (search);
stop_search (search);
+
+ file = nautilus_directory_get_corresponding_file (directory);
+ nautilus_file_invalidate_all_attributes (file);
+ nautilus_file_unref (file);
}
static gboolean
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 111976173..e9244d8cc 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -852,9 +852,6 @@ begin_location_change (NautilusWindowSlot *slot,
if (force_reload) {
nautilus_directory_force_reload (directory);
- file = nautilus_directory_get_corresponding_file (directory);
- nautilus_file_invalidate_all_attributes (file);
- nautilus_file_unref (file);
}
nautilus_directory_unref (directory);