[nautilus/wip/antoniof/make-window-slot-final] view: Streamline view ids enumeration

[António Fernandes <antoniof src gnome org>]

commit 25a0b09c463da631686bda422890ef8dc4daa2c6
Author: António Fernandes <antoniof gnome org>
Date:   Wed Jan 13 12:36:36 2021 +0000

    view: Streamline view ids enumeration
    
    The EMPTY id is unused, the INVALID id has an awkward value of 4,
    and the GRID and LIST ids are reversed compared to the keyboard shortcuts.
    
    Let's make this more logical.

 data/org.gnome.nautilus.gschema.xml | 2 +-
 src/nautilus-view.h                 | 8 ++++----
 src/nautilus-window-slot.c          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/data/org.gnome.nautilus.gschema.xml b/data/org.gnome.nautilus.gschema.xml
index 7dd6bb2d8..fb36884a0 100644
--- a/data/org.gnome.nautilus.gschema.xml
+++ b/data/org.gnome.nautilus.gschema.xml
@@ -18,8 +18,8 @@
   </enum>
 
   <enum id="org.gnome.nautilus.FolderView">
-    <value value="0" nick="icon-view"/>
     <value value="1" nick="list-view"/>
+    <value value="2" nick="icon-view"/>
   </enum>
 
   <enum id="org.gnome.nautilus.SortOrder">
diff --git a/src/nautilus-view.h b/src/nautilus-view.h
index 9d46ab6dd..0c90ae457 100644
--- a/src/nautilus-view.h
+++ b/src/nautilus-view.h
@@ -24,15 +24,15 @@
 #include "nautilus-query.h"
 #include "nautilus-toolbar-menu-sections.h"
 
-#define NAUTILUS_VIEW_GRID_ID_VALUE 0
+/* These values must match the org.gnome.nautilus.FolderView schema enum */
 #define NAUTILUS_VIEW_LIST_ID_VALUE 1
+#define NAUTILUS_VIEW_GRID_ID_VALUE 2
 enum
 {
-    NAUTILUS_VIEW_GRID_ID = NAUTILUS_VIEW_GRID_ID_VALUE,
+    NAUTILUS_VIEW_INVALID_ID = 0,
     NAUTILUS_VIEW_LIST_ID = NAUTILUS_VIEW_LIST_ID_VALUE,
-    NAUTILUS_VIEW_EMPTY_ID,
+    NAUTILUS_VIEW_GRID_ID = NAUTILUS_VIEW_GRID_ID_VALUE,
     NAUTILUS_VIEW_OTHER_LOCATIONS_ID,
-    NAUTILUS_VIEW_INVALID_ID,
 };
 
 G_BEGIN_DECLS
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 97be9bf6c..457613df8 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -1031,8 +1031,8 @@ action_files_view_mode (GSimpleAction *action,
 
 const GActionEntry slot_entries[] =
 {
-    /* 4 is NAUTILUS_VIEW_INVALID_ID */
-    { "files-view-mode", NULL, "u", "uint32 4", action_files_view_mode },
+    /* 0 is NAUTILUS_VIEW_INVALID_ID */
+    { "files-view-mode", NULL, "u", "uint32 0", action_files_view_mode },
     { "files-view-mode-toggle", action_files_view_mode_toggle },
     { "search-visible", NULL, NULL, "false", action_search_visible },
 };