Commit d8766d6f authored by Cosimo Cecchi's avatar Cosimo Cecchi Committed by Cosimo Cecchi

Stop closing parent windows at Desktop in spatial mode only if it's not

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).

svn path=/trunk/; revision=13791
parent def1d44a
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).
2008-02-21 Cosimo Cecchi <cosimoc@gnome.org>
* src/nautilus-pathbar.c: (trash_state_changed_cb),
......
......@@ -923,17 +923,18 @@ find_parent_spatial_window (NautilusSpatialWindow *window)
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment