[nautilus] Remove the Go menu

[William Jon McCann <mccann src gnome org>]

commit 2c3191c5b67973b9f67cd358179f0aaf3dddbb74
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Jul 2 10:18:26 2012 -0400

    Remove the Go menu
    
    https://bugzilla.gnome.org/show_bug.cgi?id=676531

 src/nautilus-shell-ui.xml   |   15 +--------------
 src/nautilus-window-menus.c |   34 ----------------------------------
 2 files changed, 1 insertions(+), 48 deletions(-)
---
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 30ad88b..f0307ca 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -70,23 +70,10 @@
 		</placeholder>
 	</menu>
 	<placeholder name="Other Menus">
-	        <menu action="Go">
-                        <placeholder name="Navigation Items">
-			<menuitem name="Up" action="Up"/>
-			<menuitem name="Back" action="Back"/>
-			<menuitem name="Forward"  action="Forward"/>
-	                </placeholder>
-	                <separator/>
-			<menuitem name="Home" action="Home"/>
-			<menuitem name="Go to Templates" action="Go to Templates"/>
-			<menuitem name="Go to Trash" action="Go to Trash"/>
-		        <menuitem name="Go to Network" action="Go to Network"/>
-			<menuitem name="Go to Location" action="Go to Location"/>
-			<menuitem name="Search" action="Search"/>
-		</menu>
 		<menu action="Bookmarks">
 			<menuitem name="Add Bookmark" action="Add Bookmark"/>
 			<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
+			<menuitem name="Go to Location" action="Go to Location"/>
 			<separator/>
 			<placeholder name="Bookmarks Placeholder"/>
 		</menu>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 47583cc..ff98b64 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -435,39 +435,6 @@ connect_proxy_cb (GtkActionGroup *action_group,
 	gtk_label_set_max_width_chars (label, MENU_ITEM_MAX_WIDTH_CHARS);
 }
 
-static const char* icon_entries[] = {
-	"/MenuBar/Other Menus/Go/Home",
-	"/MenuBar/Other Menus/Go/Go to Templates",
-	"/MenuBar/Other Menus/Go/Go to Trash",
-	"/MenuBar/Other Menus/Go/Go to Network",
-	"/MenuBar/Other Menus/Go/Go to Location"
-};
-
-/**
- * refresh_go_menu:
- * 
- * Refresh list of bookmarks at end of Go menu to match centralized history list.
- * @window: The NautilusWindow whose Go menu will be refreshed.
- **/
-static void
-nautilus_window_initialize_go_menu (NautilusWindow *window)
-{
-	GtkUIManager *ui_manager;
-	GtkWidget *menuitem;
-	int i;
-
-	ui_manager = nautilus_window_get_ui_manager (NAUTILUS_WINDOW (window));
-
-	for (i = 0; i < G_N_ELEMENTS (icon_entries); i++) {
-		menuitem = gtk_ui_manager_get_widget (
-				ui_manager,
-				icon_entries[i]);
-
-		gtk_image_menu_item_set_always_show_image (
-				GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
-	}
-}
-
 static void
 action_new_window_callback (GtkAction *action,
 			    gpointer user_data)
@@ -914,7 +881,6 @@ nautilus_window_initialize_menus (NautilusWindow *window)
 	gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nautilus/nautilus-shell-ui.xml", NULL);
 
 	nautilus_window_initialize_trash_icon_monitor (window);
-	nautilus_window_initialize_go_menu (window);
 }
 
 void