[nautilus] window: make sure we always force opening in new windows on the desktop

[Cosimo Cecchi <cosimoc src gnome org>]

commit 278425bbcd806571f7d5369e53a15d5f22e51551
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Apr 3 19:55:25 2011 -0400

    window: make sure we always force opening in new windows on the desktop
    
    https://bugzilla.gnome.org/show_bug.cgi?id=646548

 src/nautilus-window-manage-views.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 87862e6..74ca593 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) {