[nautilus] sort-order: resync sort order property with NautilusFileSortType

[Cosimo Cecchi <cosimoc src gnome org>]

commit 678c5216ebe3987b7b268d27fc0af78f09e58d94
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Jan 30 16:56:41 2011 -0500

    sort-order: resync sort order property with NautilusFileSortType
    
    This makes the sorting preference reliably work again.

 libnautilus-private/nautilus-file.c                |    3 ---
 libnautilus-private/nautilus-file.h                |    1 -
 .../org.gnome.nautilus.gschema.xml.in              |   11 +++++------
 src/nautilus-file-management-properties.c          |    2 --
 src/nautilus-file-management-properties.ui         |    3 ---
 5 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 7cf3bd1..3d14216 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -3112,9 +3112,6 @@ nautilus_file_compare_for_sort (NautilusFile *file_1,
 				result = compare_by_directory_name (file_1, file_2);
 			}
 			break;
-		case NAUTILUS_FILE_SORT_BY_DIRECTORY:
-			result = compare_by_full_path (file_1, file_2);
-			break;
 		case NAUTILUS_FILE_SORT_BY_SIZE:
 			/* Compare directory sizes ourselves, then if necessary
 			 * use GnomeVFS to compare file sizes.
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index 7dce93e..f0f126c 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -56,7 +56,6 @@ typedef struct NautilusFile NautilusFile;
 typedef enum {
 	NAUTILUS_FILE_SORT_NONE,
 	NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
-	NAUTILUS_FILE_SORT_BY_DIRECTORY,
 	NAUTILUS_FILE_SORT_BY_SIZE,
 	NAUTILUS_FILE_SORT_BY_TYPE,
 	NAUTILUS_FILE_SORT_BY_MTIME,
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml.in b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
index cf89262..9b0be0a 100644
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
@@ -31,12 +31,11 @@
   <enum id="org.gnome.nautilus.SortOrder">
     <value nick="manually" value="0"/>
     <value nick="name" value="1"/>
-    <value nick="directory" value="2"/>
-    <value nick="size" value="3"/>
-    <value nick="type" value="4"/>
-    <value nick="mtime" value="5"/>
-    <value nick="atime" value="6"/>
-    <value nick="trash-time" value="8"/>
+    <value nick="size" value="2"/>
+    <value nick="type" value="3"/>
+    <value nick="mtime" value="4"/>
+    <value nick="atime" value="5"/>
+    <value nick="trash-time" value="6"/>
   </enum>
 
   <enum id="org.gnome.nautilus.ZoomLevel">
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 309d03c..e508463 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -87,9 +87,7 @@ static const char * const zoom_values[] = {
 };
 
 static const char * const sort_order_values[] = {
-	"manually",
 	"name",
-	"directory",
 	"size",
 	"type",
 	"mtime",
diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui
index 1dff8a9..b5d8bd4 100644
--- a/src/nautilus-file-management-properties.ui
+++ b/src/nautilus-file-management-properties.ui
@@ -26,9 +26,6 @@
         <col id="0" translatable="yes">By Name</col>
       </row>
       <row>
-        <col id="0" translatable="yes">By Path</col>
-      </row>
-      <row>
         <col id="0" translatable="yes">By Size</col>
       </row>
       <row>