column-utilities: Use default column order from settings

There have been several locations where list orders are manually
tracked.  Rather than rely on this list which has become out of date
simply use the preference for DEFAULT_COLUMN_ORDER.

1 files changed, 5 insertions, 19 deletions

diff --git a/src/nautilus-column-utilities.c b/src/nautilus-column-utilities.c
index d65c432b3..6f1787abc 100644
--- a/src/nautilus-column-utilities.c
+++ b/src/nautilus-column-utilities.c
@@ -21,31 +21,13 @@
 
 #include <config.h>
 #include "nautilus-column-utilities.h"
+#include "nautilus-global-preferences.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
 #include <nautilus-extension.h>
 #include "nautilus-module.h"
 
-static const char *default_column_order[] =
-{
-    "name",
-    "size",
-    "type",
-    "owner",
-    "group",
-    "permissions",
-    "detailed_type",
-    "where",
-    "date_modified_with_time",
-    "date_modified",
-    "date_accessed",
-    "date_created",
-    "recency",
-    "starred",
-    NULL
-};
-
 static GList *
 get_builtin_columns (void)
 {
@@ -342,6 +324,10 @@ column_compare (NautilusColumn  *a,
     char *name_a;
     char *name_b;
     int ret;
+    g_auto (GStrv) default_column_order = NULL;
+
+    default_column_order = g_settings_get_strv (nautilus_list_view_preferences,
+                                                NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER);
 
     g_object_get (G_OBJECT (a), "name", &name_a, NULL);
     index_a = strv_index (column_order, name_a);