summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2015-07-22 11:33:04 +0200
committerCarlos Soriano <csoriano@gnome.org>2015-07-22 13:02:04 +0200
commit762a8b789fb641fe76369baa1376633c58d00f94 (patch)
treede8b0fba9e15e7e33ccb256f130bd4e664f43369
parent0ec4d68043ebbfd506212663736c45a2b4cd96ac (diff)
downloadnautilus-762a8b789fb641fe76369baa1376633c58d00f94.tar.gz
search-directory: add a function for when data is ready
-rw-r--r--libnautilus-private/nautilus-search-directory.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
index 4810b50d5..b3c263707 100644
--- a/libnautilus-private/nautilus-search-directory.c
+++ b/libnautilus-private/nautilus-search-directory.c
@@ -519,6 +519,13 @@ search_directory_add_pending_files_callbacks (NautilusSearchDirectory *search)
}
static void
+on_search_directory_search_ready_and_valid (NautilusSearchDirectory *search)
+{
+ search_directory_add_pending_files_callbacks (search);
+ search->details->search_loaded = TRUE;
+}
+
+static void
search_engine_hits_added (NautilusSearchEngine *engine, GList *hits,
NautilusSearchDirectory *search)
{
@@ -566,8 +573,7 @@ search_engine_hits_added (NautilusSearchEngine *engine, GList *hits,
nautilus_file_emit_changed (file);
nautilus_file_unref (file);
- search->details->search_loaded = TRUE;
- search_directory_add_pending_files_callbacks (search);
+ on_search_directory_search_ready_and_valid (search);
}
static void
@@ -596,8 +602,7 @@ search_engine_finished (NautilusSearchEngine *engine,
* that it finished the current search, not an old one like it's actually
* happening. */
if (status == NAUTILUS_SEARCH_PROVIDER_STATUS_NORMAL) {
- search->details->search_loaded = TRUE;
- search_directory_add_pending_files_callbacks (search);
+ on_search_directory_search_ready_and_valid (search);
nautilus_directory_emit_done_loading (NAUTILUS_DIRECTORY (search));
} else if (status == NAUTILUS_SEARCH_PROVIDER_STATUS_RESTARTING) {
/* Remove file monitors of the files from an old search that just