diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-01-13 21:09:09 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-01-14 17:04:30 +0100 |
| commit | 82c250e3c1cad6d26739c99f05aa71c5ae7bcb85 (patch) | |
| tree | 964f2d19693caeea6634d84f89d77fb2eb7e48d1 | |
| parent | 79a9736f466e552f70b0da30a36d9a83d8585158 (diff) | |
| download | nautilus-wip/csoriano/view-slot-hateness.tar.gz | |
| -rw-r--r-- | src/nautilus-files-view.c | 3 | ||||
| -rw-r--r-- | src/nautilus-window-slot.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index af2c6543e..ac8c702a9 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -3143,6 +3143,7 @@ nautilus_files_view_set_location (NautilusView *view, nautilus_profile_start (NULL); directory = nautilus_directory_get (location); + g_print ("new location\n"); load_directory (NAUTILUS_FILES_VIEW (view), directory); /* In case we want to load a previous search, sync the query */ if (NAUTILUS_IS_SEARCH_DIRECTORY (directory)) { @@ -3176,6 +3177,7 @@ done_loading (NautilusFilesView *view, GList *selection; gboolean do_reveal = FALSE; + g_print ("done loading %d\n", view->details->loading); if (!view->details->loading) { return; } @@ -7106,6 +7108,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 diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index efa94954d..ba8f7f20f 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -1440,6 +1440,7 @@ setup_view (NautilusWindowSlot *slot, /* Forward search selection and state before loading the new model */ old_location = slot->details->content_view ? nautilus_view_get_location (slot->details->content_view) : NULL; + g_print ("setup view %p\n", old_location); /* Actually load the pending location and selection: */ if (slot->details->pending_location != NULL) { load_new_location (slot, @@ -1489,6 +1490,7 @@ load_new_location (NautilusWindowSlot *slot, view = NULL; + g_print ("load new location %s %d %d\n", g_file_get_uri (location), tell_current_content_view, tell_new_content_view); nautilus_profile_start (NULL); /* Note, these may recurse into report_load_underway */ if (slot->details->content_view != NULL && tell_current_content_view) { @@ -1496,9 +1498,8 @@ load_new_location (NautilusWindowSlot *slot, nautilus_view_set_location (slot->details->content_view, location); } - if (slot->details->new_content_view != NULL && tell_new_content_view && - (!tell_current_content_view || - slot->details->new_content_view != slot->details->content_view) ) { + if (slot->details->new_content_view != NULL && tell_new_content_view) { + g_print ("new location for new\n"); view = slot->details->new_content_view; nautilus_view_set_location (slot->details->new_content_view, location); } @@ -1582,6 +1583,7 @@ nautilus_window_slot_set_content_view (NautilusWindowSlot *slot, nautilus_window_slot_stop_loading (slot); nautilus_window_slot_set_allow_stop (slot, TRUE); + g_print ("set content view\n"); if (g_list_length (selection) == 0 && NAUTILUS_IS_FILES_VIEW (slot->details->content_view)) { /* If there is no selection, queue a scroll to the same icon that |