[nautilus/remove-emblems-splitted: 15/23] Remove 'Sort by Emblems' from the views.

[Cosimo Cecchi <cosimoc src gnome org>]

commit 988e0ef8c5048ed7add4441f2325a5eb725b728e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Jul 25 12:17:02 2010 +0200

    Remove 'Sort by Emblems' from the views.

 src/file-manager/fm-icon-view.c            |   13 +------------
 src/file-manager/fm-list-view.c            |    1 -
 src/file-manager/nautilus-icon-view-ui.xml |    2 --
 3 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 320fbe4..14dddd6 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -148,13 +148,6 @@ static const SortCriterion sort_criteria[] = {
 		N_("Keep icons sorted by modification date in rows")
 	},
 	{
-		NAUTILUS_FILE_SORT_BY_EMBLEMS,
-		"emblems",
-		"Sort by Emblems",
-		N_("by _Emblems"),
-		N_("Keep icons sorted by emblems in rows")
-	},
-	{
 		NAUTILUS_FILE_SORT_BY_TRASHED_TIME,
 		"trashed",
 		"Sort by Trash Time",
@@ -786,7 +779,7 @@ get_default_sort_order (NautilusFile *file, gboolean *reversed)
 		}
 
 		retval = CLAMP (default_sort_order, NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
-				NAUTILUS_FILE_SORT_BY_EMBLEMS);
+				NAUTILUS_FILE_SORT_BY_MTIME);
 	}
 
 	return retval;
@@ -1644,10 +1637,6 @@ static const GtkRadioActionEntry arrange_radio_entries[] = {
     N_("By Modification _Date"), NULL,
     N_("Keep icons sorted by modification date in rows"),
     NAUTILUS_FILE_SORT_BY_MTIME },
-  { "Sort by Emblems", NULL,
-    N_("By _Emblems"), NULL,
-    N_("Keep icons sorted by emblems in rows"),
-    NAUTILUS_FILE_SORT_BY_EMBLEMS },
   { "Sort by Trash Time", NULL,
     N_("By T_rash Time"), NULL,
     N_("Keep icons sorted by trash time in rows"),
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 6822542..17451b2 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -184,7 +184,6 @@ get_default_sort_order (NautilusFile *file, gboolean *reversed)
 		"type",
 		"date_modified",
 		"date_accessed",
-		"emblems",
 		"trashed_on",
 		NULL
 	};
diff --git a/src/file-manager/nautilus-icon-view-ui.xml b/src/file-manager/nautilus-icon-view-ui.xml
index 179df40..ffaed19 100644
--- a/src/file-manager/nautilus-icon-view-ui.xml
+++ b/src/file-manager/nautilus-icon-view-ui.xml
@@ -15,7 +15,6 @@
 					<menuitem name="Sort by Size" action="Sort by Size"/>
 					<menuitem name="Sort by Type" action="Sort by Type"/>
 					<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
-					<menuitem name="Sort by Emblems" action="Sort by Emblems"/>
 					<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
 				</placeholder>
 				<separator name="Layout separator"/>
@@ -38,7 +37,6 @@
 					<menuitem name="Sort by Size" action="Sort by Size"/>
 					<menuitem name="Sort by Type" action="Sort by Type"/>
 					<menuitem name="Sort by Modification Date" action="Sort by Modification Date"/>
-					<menuitem name="Sort by Emblems" action="Sort by Emblems"/>
 					<menuitem name="Sort by Trash Time" action="Sort by Trash Time"/>
 				</placeholder>
 				<separator name="Layout separator"/>