Find target slot before checking whether the location actually changed,

2008-06-29  Christian Neumair  <cneumair@gnome.org>

	* src/nautilus-window-manage-views.c
	(nautilus_window_slot_open_location_full):
	Find target slot before checking whether the location actually
	changed, fall back to opening slot rather than the active slot.

svn path=/branches/multiview/; revision=14301

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5bef1938b..2b697b760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-06-29  Christian Neumair  <cneumair@gnome.org>
 
+	* src/nautilus-window-manage-views.c
+	(nautilus_window_slot_open_location_full):
+	Find target slot before checking whether the location actually
+	changed, fall back to opening slot rather than the active slot.
+
+2008-06-29  Christian Neumair  <cneumair@gnome.org>
+
 	* src/nautilus-window-slot.c (real_slot_info_get_current_location),
 	(nautilus_window_slot_info_iface_init):
 	Return pending location, fall back to current location. This API is
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 3d0d936c9..119f40079 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -610,6 +610,10 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
                 }
         }
 
+	if (target_slot == NULL) {
+		target_slot = slot;
+	}
+
         if ((!do_load_location) ||
 	    (target_window == window && target_slot == slot &&
 	     old_location && g_file_equal (old_location, location))) {
@@ -621,10 +625,6 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
 		g_object_unref (old_location);
 	}
 
-	if (target_slot == NULL) {
-		target_slot = target_window->details->active_slot;
-	}
-
         begin_location_change (target_slot, location, new_selection,
                                NAUTILUS_LOCATION_CHANGE_STANDARD, 0, NULL);
 }