list-view: Don't sort directories first on search results

We should not sort directories first on search results, as per the 
previous commit.

However, on list view, this is checked at init, before a location is 
set. We ignore if it is a search directory, as a result, we respect the 
setting to sort directories first.

Instead, we will check it later, before loading the contents, when we 
already know if it is a search directory or not.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=699629
This commit is contained in:
António Fernandes 2017-10-22 15:18:11 +00:00
parent eb1a956c26
commit 9ec56a2d48

View file

@ -89,6 +89,7 @@ static void nautilus_list_view_set_zoom_level (NautilusListView *view,
NautilusListZoomLevel new_level);
static void nautilus_list_view_scroll_to_file (NautilusListView *view,
NautilusFile *file);
static void nautilus_list_view_sort_directories_first_changed (NautilusFilesView *view);
static void apply_columns_settings (NautilusListView *list_view,
char **column_order,
@ -2379,6 +2380,7 @@ nautilus_list_view_begin_loading (NautilusFilesView *view)
list_view = NAUTILUS_LIST_VIEW (view);
nautilus_list_view_sort_directories_first_changed (NAUTILUS_FILES_VIEW (list_view));
set_sort_order_from_metadata_and_preferences (list_view);
set_columns_settings_from_metadata_and_preferences (list_view);
check_allow_sort (list_view);
@ -3648,7 +3650,6 @@ nautilus_list_view_init (NautilusListView *list_view)
nautilus_list_view_click_policy_changed (NAUTILUS_FILES_VIEW (list_view));
nautilus_list_view_sort_directories_first_changed (NAUTILUS_FILES_VIEW (list_view));
nautilus_list_view_set_zoom_level (list_view, get_default_zoom_level ());
list_view->details->hover_path = NULL;