[nautilus] files-view: be code consistent for loading a directory
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] files-view: be code consistent for loading a directory
- Date: Tue, 22 Sep 2015 21:30:01 +0000 (UTC)
commit 748eb9f8a57bad4b4182b060d0dbeee898d3615a
Author: Carlos Soriano <csoriano gnome org>
Date: Tue Sep 22 23:10:53 2015 +0200
files-view: be code consistent for loading a directory
We were using different ways for it, but we can actually use
the parent method most of the times.
src/nautilus-files-view.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index e122faa..0491eb6 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -7681,8 +7681,7 @@ nautilus_files_view_set_search_query (NautilusView *view,
location = nautilus_directory_get_location (files_view->details->model);
/*
- * Reuse the search directory if we are already searching, and
- * only update the current location.
+ * Reuse the search directory and reload it.
*/
nautilus_search_directory_set_query (NAUTILUS_SEARCH_DIRECTORY
(files_view->details->model), query);
nautilus_view_set_location (view, location);
@@ -7703,7 +7702,7 @@ nautilus_files_view_set_search_query (NautilusView *view,
nautilus_search_directory_set_base_model (NAUTILUS_SEARCH_DIRECTORY (directory),
files_view->details->model);
nautilus_search_directory_set_query (NAUTILUS_SEARCH_DIRECTORY (directory), query);
- load_directory (files_view, directory);
+ nautilus_view_set_location (view, location);
g_object_notify (G_OBJECT (view), "is-searching");
@@ -7717,8 +7716,9 @@ nautilus_files_view_set_search_query (NautilusView *view,
NautilusDirectory *base;
base = nautilus_search_directory_get_base_model (NAUTILUS_SEARCH_DIRECTORY
(files_view->details->model));
+ location = nautilus_directory_get_location (base);
- load_directory (files_view, base);
+ nautilus_view_set_location (view, location);
}
}
check_remote_warning_bar (files_view);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]