[nautilus] Remove items from the gear menu that pertain to the selection

[William Jon McCann <mccann src gnome org>]

commit 6539e93eadb25f2a77fa1e3c6bb8033e5ae0a49e
Author: William Jon McCann <jmccann redhat com>
Date:   Wed Aug 8 09:53:35 2012 -0400

    Remove items from the gear menu that pertain to the selection
    
    We want the gear menu to pertain to the directory view and
    be relatively stable. We provide selection specific items in the
    context menu.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=680985

 src/nautilus-directory-view-ui.xml |   50 +----------------------------------
 src/nautilus-shell-ui.xml          |   13 +--------
 src/nautilus-view.c                |   23 ----------------
 3 files changed, 4 insertions(+), 82 deletions(-)
---
diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
index f9ad94a..5787936 100644
--- a/src/nautilus-directory-view-ui.xml
+++ b/src/nautilus-directory-view-ui.xml
@@ -20,47 +20,12 @@
       <menuitem name="New Empty Document" action="New Empty Document"/>
     </menu>
   </placeholder>
-  <placeholder name="Open Placeholder">
-    <menuitem name="Open" action="Open"/>
-    <menuitem name="OpenInNewTab" action="OpenInNewTab"/>
-    <menuitem name="OpenAlternate" action="OpenAlternate"/>
-    <placeholder name="Applications Placeholder">
-    </placeholder>
-    <menu action="Open With">
-      <placeholder name="Applications Placeholder"/>
-      <separator name="Open With Separator"/>
-      <menuitem name="OtherApplication" action="OtherApplication1"/>
-    </menu>
-    <placeholder name="OtherApplicationPlaceholder">
-      <menuitem name="OtherApplication" action="OtherApplication2"/>
-    </placeholder>
-    <menu action="Scripts">
-      <placeholder name="Scripts Placeholder"/>
-      <separator name="After Scripts"/>
-      <menuitem name="Open Scripts Folder" action="Open Scripts Folder"/>
-    </menu>
-  </placeholder>
-  <placeholder name="File Items Placeholder">
-    <menuitem name="Self Mount Volume" action="Self Mount Volume"/>
-    <menuitem name="Self Unmount Volume" action="Self Unmount Volume"/>
-    <menuitem name="Self Eject Volume" action="Self Eject Volume"/>
-    <menuitem name="Self Start Volume" action="Self Start Volume"/>
-    <menuitem name="Self Stop Volume" action="Self Stop Volume"/>
-    <menuitem name="Self Poll" action="Self Poll"/>
-    <separator name="Properties Separator"/>
-    <menuitem name="Properties" action="Properties"/>
-  </placeholder>
   <placeholder name="Global File Items Placeholder">
     <menuitem name="Empty Trash" action="Empty Trash"/>
     <menuitem name="Save Search" action="Save Search"/>
     <menuitem name="Save Search As" action="Save Search As"/>
   </placeholder>
-  <menu action="Edit">
-    <placeholder name="Clipboard Actions">
-      <menuitem name="Cut" action="Cut"/>
-      <menuitem name="Copy" action="Copy"/>
-      <menuitem name="Paste" action="Paste"/>
-    </placeholder>
+  <placeholder name="Edit Actions">
     <placeholder name="Undostack Actions">
       <menuitem name="Undo" action="Undo"/>
       <menuitem name="Redo" action="Redo"/>
@@ -70,18 +35,7 @@
       <menuitem name="Select Pattern" action="Select Pattern"/>
       <menuitem name="Invert Selection" action="Invert Selection"/>
     </placeholder>
-    <placeholder name="File Items Placeholder">
-      <menuitem name="Duplicate" action="Duplicate"/>
-      <menuitem name="Create Link" action="Create Link"/>
-      <menuitem name="Rename" action="Rename"/>
-    </placeholder>
-    <placeholder name="Dangerous File Items Placeholder">
-      <menuitem name="Trash" action="Trash"/>
-      <menuitem name="Delete" action="Delete"/>
-      <menuitem name="Restore From Trash" action="Restore From Trash"/>
-    </placeholder>
-    <placeholder name="Extension Actions"/>
-  </menu>
+  </placeholder>
 </popup>
 <popup name="background">
   <placeholder name="Before Zoom Items">
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 868ea84..dc47520 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -40,25 +40,16 @@
   <separator/>
   <placeholder name="Global File Items Placeholder"/>
   <separator/>
-  <menu action="Edit">
+  <placeholder name="Edit Actions">
     <placeholder name="Undostack Actions"/>
     <separator/>
-    <placeholder name="Clipboard Actions">
-    </placeholder>
     <separator/>
     <placeholder name="Select Items"/>
     <separator/>
     <placeholder name="File Items Placeholder"/>
     <separator/>
-    <placeholder name="Dangerous File Items Placeholder"/>
-    <separator/>
-    <placeholder name="Edit Items Placeholder"/>
-    <placeholder name="Global Edit Items Placeholder"/>
-    <separator/>
-    <placeholder name="Extension Actions"/>
-    <separator/>
     <menuitem name="Preferences" action="Preferences"/>
-  </menu>
+  </placeholder>
   <separator/>
   <menuitem name="Add Bookmark" action="Add Bookmark"/>
   <menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 4fe37dd..84092c8 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -4512,21 +4512,6 @@ add_application_to_open_with_menu (NautilusView *view,
 	gtk_action_group_add_action (view->details->open_with_action_group,
 				     action);
 	g_object_unref (action);
-	
-	gtk_ui_manager_add_ui (nautilus_window_get_ui_manager (view->details->window),
-			       view->details->open_with_merge_id,
-			       menu_placeholder,
-			       action_name,
-			       action_name,
-			       GTK_UI_MANAGER_MENUITEM,
-			       FALSE);
-
-	path = g_strdup_printf ("%s/%s", menu_placeholder, action_name);
-	menuitem = gtk_ui_manager_get_widget (
-					      nautilus_window_get_ui_manager (view->details->window),
-					      path);
-	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
-	g_free (path);
 
 	gtk_ui_manager_add_ui (nautilus_window_get_ui_manager (view->details->window),
 			       view->details->open_with_merge_id,
@@ -8759,14 +8744,6 @@ real_update_menus (NautilusView *view)
 
 	menuitem = gtk_ui_manager_get_widget (
 					      nautilus_window_get_ui_manager (view->details->window),
-					      NAUTILUS_VIEW_MENU_PATH_OPEN);
-
-	/* Only force displaying the icon if it is an application icon */
-	gtk_image_menu_item_set_always_show_image (
-						   GTK_IMAGE_MENU_ITEM (menuitem), app_icon != NULL);
-
-	menuitem = gtk_ui_manager_get_widget (
-					      nautilus_window_get_ui_manager (view->details->window),
 					      NAUTILUS_VIEW_POPUP_PATH_OPEN);
 
 	/* Only force displaying the icon if it is an application icon */