Commit 29733c26 authored by António Fernandes's avatar António Fernandes 🐚 Committed by Carlos Soriano

file: Drop NAUTILUS_FILE_SORT_NONE

This was needed for manual layout, which was still used for handling
desktop icons. Non-desktop views still have code to gracefully handle
this value.

With the refactoring from the last commit, we can finally drop this.
parent bc4ea00e
Pipeline #44718 passed with stages
in 12 minutes and 13 seconds
......@@ -27,13 +27,12 @@
When touching this, make sure to keep the values in sync with the
#NautilusFileSortType enum in the `src/nautilus-file.h` code header file.
-->
<value value="0" nick="manually"/>
<value value="1" nick="name"/>
<value value="2" nick="size"/>
<value value="3" nick="type"/>
<value value="4" nick="mtime"/>
<value value="5" nick="atime"/>
<value value="6" nick="starred"/>
<value value="0" nick="name"/>
<value value="1" nick="size"/>
<value value="2" nick="type"/>
<value value="3" nick="mtime"/>
<value value="4" nick="atime"/>
<value value="5" nick="starred"/>
</enum>
<enum id="org.gnome.nautilus.CanvasZoomLevel">
......
......@@ -412,13 +412,6 @@ get_default_sort_order (NautilusFile *file)
sort_type = nautilus_file_get_default_sort_type (file, &reversed);
if (sort_type == NAUTILUS_FILE_SORT_NONE)
{
sort_type = CLAMP (sort_type,
NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
NAUTILUS_FILE_SORT_BY_ATIME);
}
return get_sort_criterion_by_sort_type (sort_type, reversed);
}
......
......@@ -55,13 +55,12 @@ typedef enum {
* `data/org.gnome.nautilus.gschema.xml` schemas file, and the attributes[]
* array in `src/nautilus-list-view.c`.
*/
NAUTILUS_FILE_SORT_NONE = 0, /* Formerly used for "manual" sorting. */
NAUTILUS_FILE_SORT_BY_DISPLAY_NAME = 1,
NAUTILUS_FILE_SORT_BY_SIZE = 2,
NAUTILUS_FILE_SORT_BY_TYPE = 3,
NAUTILUS_FILE_SORT_BY_MTIME = 4,
NAUTILUS_FILE_SORT_BY_ATIME = 5,
NAUTILUS_FILE_SORT_BY_STARRED = 6,
NAUTILUS_FILE_SORT_BY_DISPLAY_NAME = 0,
NAUTILUS_FILE_SORT_BY_SIZE = 1,
NAUTILUS_FILE_SORT_BY_TYPE = 2,
NAUTILUS_FILE_SORT_BY_MTIME = 3,
NAUTILUS_FILE_SORT_BY_ATIME = 4,
NAUTILUS_FILE_SORT_BY_STARRED = 5,
/* The following are specific to special locations and as such are not to be
* included in the "org.gnome.nautilus.SortOrder" enum.
......
......@@ -136,7 +136,6 @@ get_default_sort_order (NautilusFile *file,
*/
const char *attributes[] =
{
"name", /* is really "manually" which doesn't apply to lists */
"name",
"size",
"type",
......
......@@ -160,13 +160,6 @@ get_default_sort_order (NautilusFile *file)
sort_type = nautilus_file_get_default_sort_type (file, &reversed);
if (sort_type == NAUTILUS_FILE_SORT_NONE)
{
sort_type = CLAMP (sort_type,
NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
NAUTILUS_FILE_SORT_BY_ATIME);
}
return get_sorts_constants_from_sort_type (sort_type, reversed);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment