diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2015-07-22 11:26:00 +0200 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2015-07-22 13:02:04 +0200 |
| commit | 39fe811cf6b6d512495bad42211e693eff54eccd (patch) | |
| tree | 8297bfc524103761a3a03f970e07bcff119600bb | |
| parent | fe57397c9e66e178fb031b8a6e60827bd25ea5e3 (diff) | |
| download | nautilus-39fe811cf6b6d512495bad42211e693eff54eccd.tar.gz | |
search-directory: rename ensure_loaded
It is confusing with all the finished/done-loading signals
all around. This actually what it does is mark the directory as
ready to read from. Also, it connects the pending clients callbacks.
So also factor out it to make sure the difference of those actions.
| -rw-r--r-- | libnautilus-private/nautilus-search-directory.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c index c0141b65e..e8acd851a 100644 --- a/libnautilus-private/nautilus-search-directory.c +++ b/libnautilus-private/nautilus-search-directory.c @@ -506,14 +506,8 @@ search_callback_add_pending_file_callbacks (SearchCallback *callback) } static void -search_directory_ensure_loaded (NautilusSearchDirectory *search) +search_directory_add_pending_files_callbacks (NautilusSearchDirectory *search) { - if (search->details->search_loaded) { - return; - } - - search->details->search_loaded = TRUE; - /* Add all file callbacks */ g_list_foreach (search->details->pending_callback_list, (GFunc)search_callback_add_pending_file_callbacks, NULL); @@ -572,7 +566,8 @@ search_engine_hits_added (NautilusSearchEngine *engine, GList *hits, nautilus_file_emit_changed (file); nautilus_file_unref (file); - search_directory_ensure_loaded (search); + search->details->search_loaded = TRUE; + search_directory_add_pending_files_callbacks (search); } static void @@ -601,7 +596,8 @@ 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_directory_ensure_loaded (search); + search->details->search_loaded = TRUE; + search_directory_add_pending_files_callbacks (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 |