summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@gnome.org>2008-06-29 11:59:59 +0000
committerChristian Neumair <cneumair@src.gnome.org>2008-06-29 11:59:59 +0000
commitb9f9df2b91c567e7e1a5b7a74b62ed6c7a25d99d (patch)
tree25045b68ed0a9ec42e652d775441c4178af97a6a
parentb0adaa22880e4e9edce6ec6284190b54884adf7c (diff)
downloadnautilus-b9f9df2b91c567e7e1a5b7a74b62ed6c7a25d99d.tar.gz
When opening a new window, use new window's active slot instead of
2008-06-29 Christian Neumair <cneumair@gnome.org> * src/nautilus-window-manage-views.c (nautilus_window_slot_open_location_full): When opening a new window, use new window's active slot instead of re-using source slot in source window. Fixes spatial mode. svn path=/branches/multiview/; revision=14305
-rw-r--r--ChangeLog7
-rw-r--r--src/nautilus-window-manage-views.c6
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a3b80af9f..6d8e68a67 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):
+ When opening a new window, use new window's active slot instead of
+ re-using source slot in source window. Fixes spatial mode.
+
+2008-06-29 Christian Neumair <cneumair@gnome.org>
+
* src/nautilus-navigation-window.c (real_open_slot):
Remove obsolete multiview-TODO.
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 119f40079..32053c10a 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -611,7 +611,11 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
}
if (target_slot == NULL) {
- target_slot = slot;
+ if (target_window == window) {
+ target_slot = slot;
+ } else {
+ target_slot = target_window->details->active_slot;
+ }
}
if ((!do_load_location) ||