Lika underkataloger: nautilus-2.27.4.orig/src/file-manager och nautilus-2.27.4/src/file-manager
diff -u nautilus-2.27.4.orig/src/nautilus-actions.h nautilus-2.27.4/src/nautilus-actions.h
--- nautilus-2.27.4.orig/src/nautilus-actions.h	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-actions.h	2009-07-16 21:22:31.000000000 +0200
@@ -28,6 +28,7 @@
 
 #define NAUTILUS_ACTION_STOP "Stop"
 #define NAUTILUS_ACTION_RELOAD "Reload"
+#define NAUTILUS_ACTION_STOPRELOAD "StopReload"
 #define NAUTILUS_ACTION_BACK "Back"
 #define NAUTILUS_ACTION_UP "Up"
 #define NAUTILUS_ACTION_UP_ACCEL "UpAccel"
diff -u nautilus-2.27.4.orig/src/nautilus-navigation-window.c nautilus-2.27.4/src/nautilus-navigation-window.c
--- nautilus-2.27.4.orig/src/nautilus-navigation-window.c	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-navigation-window.c	2009-07-17 07:44:52.000000000 +0200
@@ -399,9 +399,8 @@
 			  0, 1,                               1, 2,
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
 			  0,                                  0);
-	gtk_widget_show (toolbar);
 
-	nautilus_navigation_window_initialize_toolbars (window);
+	gtk_toolbar_set_style (toolbar, GTK_TOOLBAR_ICONS);
 
 	/* Set initial sensitivity of some buttons & menu items 
 	 * now that they're all created.
@@ -410,7 +409,7 @@
 	nautilus_navigation_window_allow_forward (window, FALSE);
 
 	/* set up location bar */
-	location_bar = gtk_toolbar_new ();
+	location_bar = toolbar;
 	window->details->location_bar = location_bar;
 
 	hbox = gtk_hbox_new (FALSE, 12);
@@ -425,8 +424,8 @@
 			    item, -1);
 
 	window->details->location_button = location_button_create (window);
-	gtk_box_pack_start (GTK_BOX (hbox), window->details->location_button, FALSE, FALSE, 0);
-	gtk_widget_show (window->details->location_button);
+	//gtk_box_pack_start (GTK_BOX (hbox), window->details->location_button, FALSE, FALSE, 0);
+	//gtk_widget_show (window->details->location_button);
 
 	window->path_bar = g_object_new (NAUTILUS_TYPE_PATH_BAR, NULL);
  	gtk_widget_show (window->path_bar);
@@ -465,12 +464,12 @@
 	view_as_menu_vbox = gtk_vbox_new (FALSE, 4);
 	gtk_widget_show (view_as_menu_vbox);
 
-	item = gtk_tool_item_new ();
+	/*item = gtk_tool_item_new ();
 	gtk_container_set_border_width (GTK_CONTAINER (item), 4);
 	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);
+			    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);
@@ -496,12 +495,14 @@
 				 G_CALLBACK (nautilus_window_zoom_to_default),
 				 window, G_CONNECT_SWAPPED);
 	
-	item = gtk_tool_item_new ();
+	/*item = gtk_tool_item_new ();
 	gtk_container_set_border_width (GTK_CONTAINER (item), 4);
 	gtk_widget_show (GTK_WIDGET (item));
 	gtk_container_add (GTK_CONTAINER (item),  window->zoom_control);
 	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
-			    item, 1);
+			    item, 1);*/
+
+	nautilus_navigation_window_initialize_toolbars (window); //add throbber
 
 	gtk_widget_show (location_bar);
 
diff -u nautilus-2.27.4.orig/src/nautilus-navigation-window-ui.xml nautilus-2.27.4/src/nautilus-navigation-window-ui.xml
--- nautilus-2.27.4.orig/src/nautilus-navigation-window-ui.xml	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-navigation-window-ui.xml	2009-07-16 22:17:44.000000000 +0200
@@ -16,7 +16,7 @@
 		<placeholder name="Show Hide Placeholder">
 			<menuitem name="Show Hide Toolbar" action="Show Hide Toolbar"/>
 			<menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
-			<menuitem name="Show Hide Location Bar" action="Show Hide Location Bar"/>
+			<!-- <menuitem name="Show Hide Location Bar" action="Show Hide Location Bar"/> -->
 			<menuitem name="Show Hide Statusbar" action="Show Hide Statusbar"/>
 		</placeholder>
 	</menu>
@@ -64,16 +64,18 @@
 	<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="Up" action="Up"/> -->
+	<!-- <toolitem name="Stop" action="Stop"/>
+	<toolitem name="Reload" action="Reload"/> -->
+	<toolitem name="StopReload" action="StopReload"/>
+	<!-- <separator/> -->
 	<toolitem name="Home" action="Home"/>
-	<toolitem name="Computer" action="Go to Computer"/>
-	<separator/>
+	<!-- <toolitem name="Computer" action="Go to Computer"/>
+	<separator/> -->
 	<toolitem name="Search" action="Search"/>
 	<placeholder name="Extra Buttons Placeholder">
 	          <placeholder name="Extension Actions"/>
         </placeholder>
+	<!-- <separator/> -->
 </toolbar>
 </ui>
diff -u nautilus-2.27.4.orig/src/nautilus-window.c nautilus-2.27.4/src/nautilus-window.c
--- nautilus-2.27.4.orig/src/nautilus-window.c	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-window.c	2009-07-16 22:40:55.000000000 +0200
@@ -331,23 +331,48 @@
 	}
 }
 
+static void
+nautilus_window_update_stopreload (NautilusWindow *window)
+{
+	GtkAction *action;
+	
+	action = gtk_action_group_get_action (window->details->main_action_group, 
+					      NAUTILUS_ACTION_STOPRELOAD);
+
+	if (window->details->allow_stop) {
+		gtk_action_set_stock_id (action, GTK_STOCK_STOP);
+		gtk_action_set_label (action, _("Stop"));
+		gtk_action_set_tooltip (action, _("Stop loading the current location"));
+	} else {
+		gtk_action_set_stock_id (action, GTK_STOCK_REFRESH);
+		gtk_action_set_label (action, _("Reload"));
+		gtk_action_set_tooltip (action, _("Reload the current location"));
+	}
+}
+
 void
 nautilus_window_sync_allow_stop (NautilusWindow *window,
 				 NautilusWindowSlot *slot)
 {
 	GtkAction *action;
+	GtkAction *stopaction;
 	gboolean allow_stop;
 
 	g_assert (NAUTILUS_IS_WINDOW (window));
 
 	action = gtk_action_group_get_action (window->details->main_action_group,
+					      NAUTILUS_ACTION_STOPRELOAD);
+	stopaction = gtk_action_group_get_action (window->details->main_action_group,
 					      NAUTILUS_ACTION_STOP);
-	allow_stop = gtk_action_get_sensitive (action);
+
+	allow_stop = window->details->allow_stop;
 
 	if (slot != window->details->active_slot ||
 	    allow_stop != slot->allow_stop) {
 		if (slot == window->details->active_slot) {
-			gtk_action_set_sensitive (action, slot->allow_stop);
+			gtk_action_set_sensitive (stopaction, slot->allow_stop);
+			window->details->allow_stop = slot->allow_stop;
+			nautilus_window_update_stopreload (window);
 		}
 
 		if (GTK_WIDGET_REALIZED (GTK_WIDGET (window))) {
@@ -368,6 +393,8 @@
 
 	action = gtk_action_group_get_action (window->details->main_action_group,
 					      NAUTILUS_ACTION_RELOAD);
+
+	//nautilus_window_update_stopreload (window);
 	gtk_action_set_sensitive (action, allow);
 }
 
diff -u nautilus-2.27.4.orig/src/nautilus-window-menus.c nautilus-2.27.4/src/nautilus-window-menus.c
--- nautilus-2.27.4.orig/src/nautilus-window-menus.c	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-window-menus.c	2009-07-16 22:50:14.000000000 +0200
@@ -357,6 +357,20 @@
 }
 
 static void
+action_stopreload_callback (GtkAction *action, 
+			gpointer user_data) 
+{
+	NautilusWindow *window;
+
+	window = NAUTILUS_WINDOW (user_data);
+
+	if (window->details->allow_stop)
+		action_stop_callback (action, user_data);
+	else
+		action_reload_callback (action, user_data);
+}
+
+static void
 action_zoom_in_callback (GtkAction *action, 
 			 gpointer user_data) 
 {
@@ -796,6 +810,10 @@
   /* label, accelerator */       N_("_Stop"), NULL,
   /* tooltip */                  N_("Stop loading the current location"),
                                  G_CALLBACK (action_stop_callback) },
+  /* name, stock id */         { "StopReload", GTK_STOCK_REFRESH,
+  /* label, accelerator */       N_("_Reload"), NULL,
+  /* tooltip */                  N_("Reload the current location"),
+                                 G_CALLBACK (action_stopreload_callback) },
   /* name, stock id */         { "Reload", GTK_STOCK_REFRESH,
   /* label, accelerator */       N_("_Reload"), "<control>R",
   /* tooltip */                  N_("Reload the current location"),
diff -u nautilus-2.27.4.orig/src/nautilus-window-private.h nautilus-2.27.4/src/nautilus-window-private.h
--- nautilus-2.27.4.orig/src/nautilus-window-private.h	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-window-private.h	2009-07-16 22:49:32.000000000 +0200
@@ -79,6 +79,9 @@
 	 * is cancelled
 	 */
 	gboolean temporarily_ignore_view_signals;
+
+        /* Stop button enabled */
+        gboolean allow_stop;
 };
 
 struct _NautilusNavigationWindowDetails {
diff -u nautilus-2.27.4.orig/src/nautilus-window-toolbars.c nautilus-2.27.4/src/nautilus-window-toolbars.c
--- nautilus-2.27.4.orig/src/nautilus-window-toolbars.c	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-window-toolbars.c	2009-07-15 19:06:49.000000000 +0200
@@ -103,12 +103,6 @@
 		return;
 	}
 
-	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 = nautilus_throbber_new ();
 	gtk_widget_show (GTK_WIDGET (throbber));
 
