[nautilus] canvas-view: more actions cleanups

[Cosimo Cecchi <cosimoc src gnome org>]

commit 8ee1679c969b20f8e74969397e1fc27a3f8b47bb
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Sep 6 16:27:09 2012 -0400

    canvas-view: more actions cleanups

 src/nautilus-canvas-view-ui.xml         |    2 --
 src/nautilus-canvas-view.c              |   24 ++++++------------------
 src/nautilus-desktop-canvas-view-ui.xml |    5 ++++-
 3 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/src/nautilus-canvas-view-ui.xml b/src/nautilus-canvas-view-ui.xml
index 88db9ce..394c0fd 100644
--- a/src/nautilus-canvas-view-ui.xml
+++ b/src/nautilus-canvas-view-ui.xml
@@ -15,8 +15,6 @@
     </placeholder>
     <separator/>
     <placeholder name="View Details">
-      <menuitem name="Stretch" action="Stretch"/>
-      <menuitem name="Unstretch" action="Unstretch"/>
     </placeholder>
   </popup>
 </ui>
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index 8ffca38..c978321 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -79,8 +79,6 @@ typedef struct {
 	const NautilusFileSortType sort_type;
 	const char *metadata_text;
 	const char *action;
-	const char *menu_label;
-	const char *menu_hint;
 } SortCriterion;
 
 typedef enum {
@@ -124,37 +122,27 @@ static const SortCriterion sort_criteria[] = {
 	{
 		NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
 		"name",
-		"Sort by Name",
-		N_("by _Name"),
-		N_("Keep icons sorted by name in rows")
+		"Sort by Name"
 	},
 	{
 		NAUTILUS_FILE_SORT_BY_SIZE,
 		"size",
-		"Sort by Size",
-		N_("by _Size"),
-		N_("Keep icons sorted by size in rows")
+		"Sort by Size"
 	},
 	{
 		NAUTILUS_FILE_SORT_BY_TYPE,
 		"type",
-		"Sort by Type",
-		N_("by _Type"),
-		N_("Keep icons sorted by type in rows")
+		"Sort by Type"
 	},
 	{
 		NAUTILUS_FILE_SORT_BY_MTIME,
 		"modification date",
-		"Sort by Modification Date",
-		N_("by Modification _Date"),
-		N_("Keep icons sorted by modification date in rows")
+		"Sort by Modification Date"
 	},
 	{
 		NAUTILUS_FILE_SORT_BY_TRASHED_TIME,
 		"trashed",
-		"Sort by Trash Time",
-		N_("by T_rash Time"),
-		N_("Keep icons sorted by trash time in rows")
+		NAUTILUS_ACTION_SORT_TRASH_TIME
 	}
 };
 
@@ -1182,7 +1170,7 @@ 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 Trash Time", NULL,
+  { NAUTILUS_ACTION_SORT_TRASH_TIME, NULL,
     N_("By T_rash Time"), NULL,
     N_("Keep icons sorted by trash time in rows"),
     NAUTILUS_FILE_SORT_BY_TRASHED_TIME },
diff --git a/src/nautilus-desktop-canvas-view-ui.xml b/src/nautilus-desktop-canvas-view-ui.xml
index ae8beeb..8d631ee 100644
--- a/src/nautilus-desktop-canvas-view-ui.xml
+++ b/src/nautilus-desktop-canvas-view-ui.xml
@@ -20,6 +20,9 @@
   <placeholder name="Empty Trash Holder">
     <menuitem name="Empty Trash" action="Empty Trash Conditional"/>
   </placeholder>
-  <placeholder name="Canvas Appearance Items"/>
+  <placeholder name="Canvas Appearance Items">
+    <menuitem name="Stretch" action="Stretch"/>
+    <menuitem name="Unstretch" action="Unstretch"/>
+  </placeholder>
 </popup>
 </ui>