diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-01-21 17:44:08 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-01-21 17:44:08 +0100 |
| commit | c764ffa7d2d71199af22c1f0e9298727c8ba03ed (patch) | |
| tree | 421d775db915f4beed59772a2fc5887fe6bef930 | |
| parent | 8d4e6accc2bda6cbe8632de736397e20bdf826e7 (diff) | |
| download | nautilus-wip/csoriano/more-search-robustness.tar.gz | |
more search robustness and whatnot burn the viewswip/csoriano/more-search-robustness
| -rw-r--r-- | libnautilus-private/nautilus-search-directory.c | 2 | ||||
| -rw-r--r-- | src/nautilus-files-view.c | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c index a920a8589..b3b6b0f6b 100644 --- a/libnautilus-private/nautilus-search-directory.c +++ b/libnautilus-private/nautilus-search-directory.c @@ -594,7 +594,7 @@ search_engine_hits_added (NautilusSearchEngine *engine, GList *hits, nautilus_file_emit_changed (file); nautilus_file_unref (file); - on_search_directory_search_ready_and_valid (search); + search_directory_add_pending_files_callbacks (search); } static void diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 99126f2be..87c468212 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -376,6 +376,7 @@ check_empty_states (NautilusFilesView *view) static void remove_loading_floating_bar (NautilusFilesView *view) { + g_print ("##############remove floating bar\n"); if (view->details->floating_bar_loading_timeout_id != 0) { g_source_remove (view->details->floating_bar_loading_timeout_id); view->details->floating_bar_loading_timeout_id = 0; @@ -390,6 +391,8 @@ real_setup_loading_floating_bar (NautilusFilesView *view) { gboolean disable_chrome; + g_print ("#########real setup floating bar\n"); + g_object_get (nautilus_files_view_get_window (view), "disable-chrome", &disable_chrome, NULL); @@ -426,6 +429,7 @@ setup_loading_floating_bar_timeout_cb (gpointer user_data) static void setup_loading_floating_bar (NautilusFilesView *view) { + g_print ("######### setup floating bar\n"); /* setup loading overlay */ if (view->details->floating_bar_set_status_timeout_id != 0) { g_source_remove (view->details->floating_bar_set_status_timeout_id); @@ -3664,7 +3668,8 @@ display_pending_files (NautilusFilesView *view) if (view->details->model != NULL && nautilus_directory_are_all_files_seen (view->details->model) && g_hash_table_size (view->details->non_ready_files) == 0) { - done_loading (view, TRUE); + g_print ("display pending files\n"); + done_loading (view, nautilus_directory_are_all_files_seen (view->details->model)); } } @@ -3788,9 +3793,7 @@ queue_pending_files (NautilusFilesView *view, *pending_list = g_list_concat (file_and_directory_list_from_files (directory, files), *pending_list); - if (! view->details->loading || nautilus_directory_are_all_files_seen (directory)) { - schedule_timeout_display_of_pending_files (view, view->details->update_interval); - } + schedule_timeout_display_of_pending_files (view, view->details->update_interval); } static void @@ -3881,6 +3884,7 @@ files_added_callback (NautilusDirectory *directory, window, uri ? uri : "(no directory)"); g_free (uri); + g_print ("files added callback\n"); schedule_changes (view); queue_pending_files (view, directory, files, &view->details->new_added_files); @@ -3929,6 +3933,7 @@ done_loading_callback (NautilusDirectory *directory, view = NAUTILUS_FILES_VIEW (callback_data); + g_print ("##### done loading \n"); nautilus_profile_start (NULL); process_new_files (view); if (g_hash_table_size (view->details->non_ready_files) == 0) { @@ -7116,6 +7121,7 @@ load_directory (NautilusFilesView *view, view->details->location = nautilus_directory_get_location (directory); g_object_notify (G_OBJECT (view), "location"); + g_object_notify (G_OBJECT (view), "is-loading"); g_object_notify (G_OBJECT (view), "is-searching"); /* FIXME bugzilla.gnome.org 45062: In theory, we also need to monitor metadata here (as @@ -7181,7 +7187,6 @@ finish_loading (NautilusFilesView *view) */ nautilus_profile_start ("BEGIN_LOADING"); g_signal_emit (view, signals[BEGIN_LOADING], 0); - g_object_notify (G_OBJECT (view), "is-loading"); nautilus_profile_end ("BEGIN_LOADING"); check_empty_states (view); |