Index: src/nautilus-navigation-window.c
===================================================================
--- src/nautilus-navigation-window.c	(Revision 13686)
+++ src/nautilus-navigation-window.c	(Arbeitskopie)
@@ -128,9 +128,6 @@
 
 static void nautilus_navigation_window_show_location_bar_temporarily (NautilusNavigationWindow *window);
 
-static void view_as_menu_switch_views_callback	     (GtkComboBox              *combo_box,
-						      NautilusWindow           *window);
-
 G_DEFINE_TYPE (NautilusNavigationWindow, nautilus_navigation_window, NAUTILUS_TYPE_WINDOW)
 #define parent_class nautilus_navigation_window_parent_class
 
@@ -193,7 +190,6 @@
 	GtkUIManager *ui_manager;
 	GtkWidget *toolbar;
 	GtkWidget *location_bar;
-	GtkWidget *view_as_menu_vbox;
 	GtkToolItem *item;
 	GtkWidget *hbox, *vbox, *eventbox, *extras_vbox;
 
@@ -241,6 +237,26 @@
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
 			  0,                                  0);
 	gtk_widget_show (toolbar);
+	
+	/* Allocate the zoom control.  It will be put on the toolbar
+	 * by nautilus_navigation_window_intialize_toolbars.
+	 */
+	window->zoom_control = nautilus_zoom_control_new ();
+	g_signal_connect_object (window->zoom_control, "zoom_in",
+				 G_CALLBACK (nautilus_window_zoom_in),
+				 window, G_CONNECT_SWAPPED);
+	g_signal_connect_object (window->zoom_control, "zoom_out",
+				 G_CALLBACK (nautilus_window_zoom_out),
+				 window, G_CONNECT_SWAPPED);
+	g_signal_connect_object (window->zoom_control, "zoom_to_level",
+				 G_CALLBACK (nautilus_window_zoom_to_level),
+				 window, G_CONNECT_SWAPPED);
+	g_signal_connect_object (window->zoom_control, "zoom_to_default",
+				 G_CALLBACK (nautilus_window_zoom_to_default),
+				 window, G_CONNECT_SWAPPED);
+	
+	window->view_as_combo_box = gtk_combo_box_new_text ();	
+	gtk_widget_show (window->view_as_combo_box);
 
 	nautilus_navigation_window_initialize_toolbars (window);
 
@@ -294,56 +310,11 @@
 				 G_CALLBACK (search_bar_activate_callback), window, 0);
 	g_signal_connect_object (window->search_bar, "cancel",
 				 G_CALLBACK (search_bar_cancel_callback), window, 0);
+
 	gtk_box_pack_start (GTK_BOX (hbox),
 			    window->search_bar,
 			    TRUE, TRUE, 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. 
-	 */
-	view_as_menu_vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_widget_show (view_as_menu_vbox);
-
-	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), view_as_menu_vbox);
-	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
-			    item, -1);
-	
-	window->view_as_combo_box = gtk_combo_box_new_text ();
-	gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (window->view_as_combo_box), FALSE);
-	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);
-	g_signal_connect_object (window->view_as_combo_box, "changed",
-				 G_CALLBACK (view_as_menu_switch_views_callback), window, 0);
-
-	/* Allocate the zoom control and place on the right next to the menu.
-	 * It gets shown later, if the view-frame contains something zoomable.
-	 */
-	window->zoom_control = nautilus_zoom_control_new ();
-	g_signal_connect_object (window->zoom_control, "zoom_in",
-				 G_CALLBACK (nautilus_window_zoom_in),
-				 window, G_CONNECT_SWAPPED);
-	g_signal_connect_object (window->zoom_control, "zoom_out",
-				 G_CALLBACK (nautilus_window_zoom_out),
-				 window, G_CONNECT_SWAPPED);
-	g_signal_connect_object (window->zoom_control, "zoom_to_level",
-				 G_CALLBACK (nautilus_window_zoom_to_level),
-				 window, G_CONNECT_SWAPPED);
-	g_signal_connect_object (window->zoom_control, "zoom_to_default",
-				 G_CALLBACK (nautilus_window_zoom_to_default),
-				 window, G_CONNECT_SWAPPED);
-	
-	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);
-
-	gtk_widget_show (location_bar);
-
 	gtk_table_attach (GTK_TABLE (NAUTILUS_WINDOW (window)->details->table),
 			  location_bar,
 			  /* X direction */                    /* Y direction */
@@ -358,6 +329,8 @@
 	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER,
 						  always_use_browser_changed,
 						  window, G_OBJECT (window));
+	
+	gtk_widget_show (location_bar);
 }
 
 static void
@@ -832,43 +805,6 @@
 }
 
 static void
-activate_nth_short_list_item (NautilusWindow *window, guint index)
-{
-	g_assert (NAUTILUS_IS_WINDOW (window));
-	g_assert (index < g_list_length (window->details->short_list_viewers));
-
-	nautilus_window_set_content_view (window, 
-					  g_list_nth_data (window->details->short_list_viewers, index));
-}
-
-static void
-activate_extra_viewer (NautilusWindow *window)
-{
-	g_assert (NAUTILUS_IS_WINDOW (window));
-	g_assert (window->details->extra_viewer != NULL);
-	
-	nautilus_window_set_content_view (window, window->details->extra_viewer);	
-}
-
-static void
-view_as_menu_switch_views_callback (GtkComboBox *combo_box, NautilusWindow *window)
-{         
-	int active;
-	g_assert (GTK_IS_COMBO_BOX (combo_box));
-	g_assert (NAUTILUS_IS_WINDOW (window));
-
-	active = gtk_combo_box_get_active (combo_box);
-
-	if (active < 0) {
-		return;
-	} else if (active < GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo_box), "num viewers"))) {
-		activate_nth_short_list_item (window, active);
-	} else {
-		activate_extra_viewer (window);
-	}
-}
-
-static void
 load_view_as_menu (NautilusWindow *window)
 {
 	GList *node;
Index: src/nautilus-window-toolbars.c
===================================================================
--- src/nautilus-window-toolbars.c	(Revision 13686)
+++ src/nautilus-window-toolbars.c	(Arbeitskopie)
@@ -42,6 +42,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-popup-menu.h>
+#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
@@ -99,18 +100,57 @@
 nautilus_navigation_window_activate_throbber (NautilusNavigationWindow *window)
 {
 	GtkToolItem *item;
+	GtkWidget *view_as_menu_vbox;
 	GtkWidget *throbber;
 
+ 	
+	/*Preconditions*/
+	g_return_if_fail (window->zoom_control != NULL);
+	g_return_if_fail (window->view_as_combo_box != NULL);
+
 	if (window->details->throbber != NULL) {
 		return;
 	}
-
+ 	
+	/*Seperator*/
+	item = gtk_separator_tool_item_new ();
+	gtk_widget_show (GTK_WIDGET (item));
+	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
+			    item, -1);
+	
+	/*Zoom control*/
 	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 (window->details->toolbar),
+			    item, -1);
+	
+	/*Seperator*/
+	item = gtk_separator_tool_item_new ();
+	gtk_widget_show (GTK_WIDGET (item));
+	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
+			    item, -1);
+			    
+	/*View as combo*/
+	view_as_menu_vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
+	gtk_widget_show (view_as_menu_vbox);
+	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), view_as_menu_vbox);
+	gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), window->view_as_combo_box, FALSE, FALSE, 0);
+	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
+			    item, -1);
+	
+	/*Spacing*/
+	item = gtk_tool_item_new ();
+	gtk_widget_show (GTK_WIDGET (item));
 	gtk_tool_item_set_expand (item, TRUE);
 	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
 			    item, -1);
 
+	/*Throbber*/
 	throbber = nautilus_throbber_new ();
 	gtk_widget_show (GTK_WIDGET (throbber));
 
