summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2011-04-03 19:55:25 -0400
committerCosimo Cecchi <cosimoc@gnome.org>2011-04-04 09:29:57 -0400
commit278425bbcd806571f7d5369e53a15d5f22e51551 (patch)
treefbc389035c1ae764ad8a74b7661a27634454408c
parent68b57af6e476253b36d8652a681bade6facbd259 (diff)
downloadnautilus-278425bbcd806571f7d5369e53a15d5f22e51551.tar.gz
window: make sure we always force opening in new windows on the desktop
https://bugzilla.gnome.org/show_bug.cgi?id=646548
-rw-r--r--src/nautilus-window-manage-views.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 87862e637..74ca593a1 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -476,9 +476,11 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
is_desktop = NAUTILUS_IS_DESKTOP_WINDOW (window);
- /* we use the same window if the preferences say so, but also for the first desktop window */
- use_same |= g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER) ||
- (is_desktop && !nautilus_desktop_window_loaded (NAUTILUS_DESKTOP_WINDOW (window)));
+ if (is_desktop) {
+ use_same = !nautilus_desktop_window_loaded (NAUTILUS_DESKTOP_WINDOW (window));
+ } else {
+ use_same |= g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER);
+ }
/* and if the flags specify so, this is overridden */
if ((flags & NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW) != 0) {