File nautilus-disable-zoom-control-and-view-as-option-menu.patch of Package nautilus

? depcomp
? nautilus-disable-zoom-control-and-view-as-option-menu.patch
? nautilus-folder-handler.desktop
? stamp-h1
? src/.nautilus-navigation-window.c.swp
? src/nautilus-navigation-window.c.joe
Index: src/nautilus-navigation-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-navigation-window.c,v
retrieving revision 1.438
diff -u -p -u -r1.438 nautilus-navigation-window.c
--- src/nautilus-navigation-window.c	3 Aug 2005 11:28:58 -0000	1.438
+++ src/nautilus-navigation-window.c	31 Oct 2005 15:39:11 -0000
@@ -129,7 +129,9 @@ nautilus_navigation_window_instance_init
 	GtkUIManager *ui_manager;
 	GtkWidget *toolbar;
 	GtkWidget *location_bar;
+#if 0
 	GtkWidget *view_as_menu_vbox;
+#endif
 	GtkToolItem *item;
 	GtkWidget *hbox;
 	
@@ -205,6 +207,7 @@ nautilus_navigation_window_instance_init
 			    window->navigation_bar,
 			    TRUE, TRUE, 0);
 
+#if 0
 	/* Option menu for content view types; it's empty here, filled in when a uri is set.
 	 * Pack it into vbox so it doesn't grow vertically when location bar does. 
 	 */
@@ -217,10 +220,13 @@ nautilus_navigation_window_instance_init
 	gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox);
 	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
 			    item, -1);
+#endif
 	
 	window->view_as_option_menu = gtk_option_menu_new ();
+#if 0
 	gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), window->view_as_option_menu, TRUE, FALSE, 0);
 	gtk_widget_show (window->view_as_option_menu);
+#endif
 
 	/* Allocate the zoom control and place on the right next to the menu.
 	 * It gets shown later, if the view-frame contains something zoomable.
@@ -238,13 +244,15 @@ nautilus_navigation_window_instance_init
 	g_signal_connect_object (window->zoom_control, "zoom_to_default",
 				 G_CALLBACK (nautilus_window_zoom_to_default),
 				 window, G_CONNECT_SWAPPED);
-	
+
+#if 0	
 	item = gtk_tool_item_new ();
 	gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
 	gtk_widget_show (GTK_WIDGET (item));
 	gtk_container_add (GTK_CONTAINER (item),  window->zoom_control);
 	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
 			    item, 1);
+#endif
 
 	gtk_widget_show (location_bar);