summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Moore <jaredm@svn.gnome.org>2008-06-08 13:12:44 +0000
committerJared William Moore <jaredm@src.gnome.org>2008-06-08 13:12:44 +0000
commit189c4fc94b413a32ebce7d9bc368a5d9bbc4d2b0 (patch)
tree72f115485134175b06f7b1d3755b5a5885cb0121
parentd2cecaf82eebaf43cb80adfdc054022dbf6f0f9b (diff)
downloadnautilus-189c4fc94b413a32ebce7d9bc368a5d9bbc4d2b0.tar.gz
Do not skip begin_location_change if opening the same location in the same
2008-06-08 Jared Moore <jaredm@svn.gnome.org> * src/nautilus-window-manage-views.c (nautilus_window_slot_open_location_full): Do not skip begin_location_change if opening the same location in the same window but a different slot. svn path=/branches/multiview/; revision=14237
-rw-r--r--ChangeLog7
-rw-r--r--src/nautilus-window-manage-views.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e20d8f2e8..9020a1877 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-06-08 Jared Moore <jaredm@svn.gnome.org>
+ * src/nautilus-window-manage-views.c
+ (nautilus_window_slot_open_location_full):
+ Do not skip begin_location_change if opening the same location in
+ the same window but a different slot.
+
+2008-06-08 Jared Moore <jaredm@svn.gnome.org>
+
* src/nautilus-places-sidebar.c (open_selected_bookmark),
(open_shortcut_from_menu), (open_shortcut_cb),
(open_shortcut_in_new_window_cb), (open_shortcut_in_new_tab_cb),
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 5dc6d48b6..46135238e 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -610,7 +610,7 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
}
if ((!do_load_location) ||
- (target_window == window &&
+ (target_window == window && target_slot == slot &&
old_location && g_file_equal (old_location, location))) {
g_object_unref (old_location);
return;