? 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
================================================================================
--- src/nautilus-navigation-window.c
+++ src/nautilus-navigation-window.c
@@ -145,7 +145,9 @@
 	GtkUIManager *ui_manager;
 	GtkWidget *toolbar;
 	GtkWidget *location_bar;
+#if 0
 	GtkWidget *view_as_menu_vbox;
+#endif
 	GtkToolItem *item;
 	GtkWidget *hbox, *vbox, *eventbox, *extras_vbox;
 	
@@ -246,6 +248,7 @@
 			    window->search_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. 
 	 */
@@ -258,10 +261,13 @@
 	gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox);
 	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
 			    item, -1);
+#endif
 	
 	window->view_as_combo_box = gtk_combo_box_new_text ();
+#if 0
 	gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), window->view_as_combo_box, TRUE, FALSE, 0);
 	gtk_widget_show (window->view_as_combo_box);
+#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.
@@ -279,13 +285,15 @@
 	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);