nautilus r14301 - in branches/multiview: . src

[cneumair svn gnome org]

Author: cneumair
Date: Sun Jun 29 11:29:21 2008
New Revision: 14301
URL: http://svn.gnome.org/viewvc/nautilus?rev=14301&view=rev

Log:
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.


Modified:
   branches/multiview/ChangeLog
   branches/multiview/src/nautilus-window-manage-views.c

Modified: branches/multiview/src/nautilus-window-manage-views.c
==============================================================================
--- branches/multiview/src/nautilus-window-manage-views.c	(original)
+++ branches/multiview/src/nautilus-window-manage-views.c	Sun Jun 29 11:29:21 2008
@@ -610,6 +610,10 @@
                 }
         }
 
+	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 @@
 		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);
 }