nautilus r13791 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Thu Feb 21 09:32:02 2008
New Revision: 13791
URL: http://svn.gnome.org/viewvc/nautilus?rev=13791&view=rev

Log:
2008-02-21  Cosimo Cecchi  <cosimoc gnome org>

	* src/nautilus-application.c: (find_parent_spatial_window):
	Stop closing parent windows at Desktop in spatial mode only if it's
	not explicitly opened in a spatial window. (#515180).


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-application.c

Modified: trunk/src/nautilus-application.c
==============================================================================
--- trunk/src/nautilus-application.c	(original)
+++ trunk/src/nautilus-application.c	Thu Feb 21 09:32:02 2008
@@ -923,17 +923,18 @@
 	while (parent_file) {
 		NautilusSpatialWindow *parent_window;
 
-		/* Stop at the desktop directory, as this is the
-		 * conceptual root of the spatial windows */
-		if (nautilus_file_is_desktop_directory (parent_file)) {
-			nautilus_file_unref (parent_file);
-			return NULL;
-		}
-
 		location = nautilus_file_get_location (parent_file);
 		parent_window = nautilus_application_get_existing_spatial_window (location);
 		g_object_unref (location);
 
+		/* Stop at the desktop directory if it's not explicitely opened
+		 * in a spatial window of its own.
+		 */
+		if (nautilus_file_is_desktop_directory (parent_file) && !parent_window) {
+			nautilus_file_unref (parent_file);
+			return NULL;
+		}
+
 		if (parent_window) {
 			nautilus_file_unref (parent_file);
 			return parent_window;