[nautilus] Remove duplicate view items from the background menu

[William Jon McCann <mccann src gnome org>]

commit 88f9c3cc46fd54b5b9aa9234a55ea1bc29202e6d
Author: William Jon McCann <jmccann redhat com>
Date:   Fri Aug 31 11:57:22 2012 -0400

    Remove duplicate view items from the background menu
    
    https://bugzilla.gnome.org/show_bug.cgi?id=667386

 src/nautilus-canvas-view-ui.xml         |   20 --------------------
 src/nautilus-desktop-canvas-view-ui.xml |    4 ++++
 src/nautilus-directory-view-ui.xml      |    9 ---------
 src/nautilus-shell-ui.xml               |    6 ------
 4 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/src/nautilus-canvas-view-ui.xml b/src/nautilus-canvas-view-ui.xml
index 014e8f2..a5da23b 100644
--- a/src/nautilus-canvas-view-ui.xml
+++ b/src/nautilus-canvas-view-ui.xml
@@ -20,26 +20,6 @@
       <menuitem name="Unstretch" action="Unstretch"/>
     </placeholder>
   </popup>
-  <popup name="background">
-    <placeholder name="Before Zoom Items">
-      <placeholder name="View Items">
-        <menu action="Arrange Items">
-          <menuitem name="Manual Layout" action="Manual Layout"/>
-          <placeholder name="Auto Layout">
-            <menuitem name="Sort by Name" action="Sort by Name"/>
-            <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 Trash Time" action="Sort by Trash Time"/>
-          </placeholder>
-          <separator name="Layout separator"/>
-          <menuitem name="Reversed Order" action="Reversed Order"/>
-        </menu>
-        <menuitem name="Clean Up" action="Clean Up"/>
-        <menuitem name="Keep Aligned" action="Keep Aligned"/>
-      </placeholder>
-    </placeholder>
-  </popup>
   <popup name="selection">
     <placeholder name="Canvas Appearance Items"/>
   </popup>
diff --git a/src/nautilus-desktop-canvas-view-ui.xml b/src/nautilus-desktop-canvas-view-ui.xml
index 410bb8d..9348a92 100644
--- a/src/nautilus-desktop-canvas-view-ui.xml
+++ b/src/nautilus-desktop-canvas-view-ui.xml
@@ -5,6 +5,10 @@
     </placeholder>
     <placeholder name="New Object Items">
     </placeholder>
+    <placeholder name="View Items">
+      <menuitem name="Clean Up" action="Clean Up"/>
+      <menuitem name="Keep Aligned" action="Keep Aligned"/>
+    </placeholder>
   </placeholder>
   <placeholder name="After Zoom Items">
     <placeholder name="Background Items">
diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
index 79d737d..f3ad98f 100644
--- a/src/nautilus-directory-view-ui.xml
+++ b/src/nautilus-directory-view-ui.xml
@@ -46,20 +46,12 @@
         <separator name="After New Documents"/>
         <menuitem name="New Empty Document" action="New Empty Document"/>
       </menu>
-      <menu action="Scripts">
-        <placeholder name="Scripts Placeholder"/>
-        <separator name="After Scripts"/>
-        <menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
-      </menu>
     </placeholder>
-    <separator name="View items separator"/>
-    <placeholder name="View Items"/>
     <separator name="Clipboard separator"/>
     <placeholder name="File Clipboard Actions">
       <menuitem name="Paste" action="Paste"/>
     </placeholder>
   </placeholder>
-
   <separator name="Folder Items separator"/>
   <placeholder name="Folder Items Placeholder">
     <menuitem name="Self Mount Volume" action="Self Mount Volume"/>
@@ -71,7 +63,6 @@
     <separator name="Properties separator"/>
     <menuitem name="Properties" action="Properties"/>
   </placeholder>
-
 </popup>
 <popup name="selection">
   <placeholder name="New Object Items">
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 187cc83..3f490a8 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -85,12 +85,6 @@
 	       <placeholder name="Extension Actions"/>
 	</placeholder>
         <separator/>
-	<placeholder name="Zoom Items">
-		<menuitem name="Zoom In" action="Zoom In"/>
-		<menuitem name="Zoom Out" action="Zoom Out"/>
-		<menuitem name="Zoom Normal" action="Zoom Normal"/>
-	</placeholder>
-        <separator/>
 	<placeholder name="After Zoom Items"/>
 </popup>
 </ui>