[nautilus] navigation-window: comment out old toolbar code for now

[Cosimo Cecchi <cosimoc src gnome org>]

commit 47958798846c8bbf85f2e28abc9b66d8266e890f
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Feb 9 18:26:03 2011 -0500

    navigation-window: comment out old toolbar code for now

 src/nautilus-navigation-window-ui.xml |   12 ------------
 src/nautilus-navigation-window.c      |    7 ++++---
 2 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml
index 38dd246..8155062 100644
--- a/src/nautilus-navigation-window-ui.xml
+++ b/src/nautilus-navigation-window-ui.xml
@@ -27,7 +27,6 @@
                           <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
                         </menu>
 			<menuitem name="Show Hide Toolbar" action="Show Hide Toolbar"/>
-			<menuitem name="Show Hide Location Bar" action="Show Hide Location Bar"/>
 			<menuitem name="Show Hide Statusbar" action="Show Hide Statusbar"/>
 			<menuitem name="Show Hide Extra Pane" action="Show Hide Extra Pane"/>
 		</placeholder>
@@ -64,17 +63,6 @@
 <toolbar name="Toolbar">
 	<toolitem name="Back" action="Back"/>
 	<toolitem name="Forward" action="Forward"/>
-
-	<toolitem name="Up" action="Up"/>
-	<toolitem name="Stop" action="Stop"/>
-	<toolitem name="Reload" action="Reload"/>
-	<separator/>
-	<toolitem name="Home" action="Home"/>
-	<toolitem name="Computer" action="Go to Computer"/>
-	<separator/>
-	<toolitem name="Zoom" action="Zoom"/>
-	<toolitem name="ViewAs" action="ViewAs"/>
-	<toolitem name="Search" action="Search"/>
 	<placeholder name="Extra Buttons Placeholder">
 	          <placeholder name="Extension Actions"/>
         </placeholder>
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 83fad59..c39acce 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -800,8 +800,8 @@ side_pane_id_changed (NautilusNavigationWindow *window)
 static void
 nautilus_navigation_window_init (NautilusNavigationWindow *window)
 {
-	GtkUIManager *ui_manager;
-	GtkWidget *toolbar;
+	//	GtkUIManager *ui_manager;
+	//	GtkWidget *toolbar;
 	NautilusWindow *win;
 	NautilusNavigationWindowPane *pane;
 	GtkWidget *hpaned;
@@ -852,6 +852,7 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 
 	nautilus_navigation_window_initialize_menus (window);
 
+#if 0
 	ui_manager = nautilus_window_get_ui_manager (NAUTILUS_WINDOW (window));
 	toolbar = gtk_ui_manager_get_widget (ui_manager, "/Toolbar");
 	window->details->toolbar = toolbar;
@@ -864,7 +865,7 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 	gtk_widget_show (toolbar);
 
 	nautilus_navigation_window_initialize_toolbars (window);
-
+#endif
 	/* Set initial sensitivity of some buttons & menu items
 	 * now that they're all created.
 	 */