nautilus r14735 - in branches/gnome-2-24: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Fri Oct 17 17:24:33 2008
New Revision: 14735
URL: http://svn.gnome.org/viewvc/nautilus?rev=14735&view=rev

Log:
2008-10-17  Alexander Larsson  <alexl redhat com>

	Merged from trunk:

        * libnautilus-private/nautilus-bookmark.c:
        (bookmark_file_changed_callback):
	Don't immediately recreate NautilusFile for the
	bookmark when the file is deleted, as this can
	cause loops if the file is monitored.
	See https://bugzilla.redhat.com/show_bug.cgi?id=465479



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/libnautilus-private/nautilus-bookmark.c

Modified: branches/gnome-2-24/libnautilus-private/nautilus-bookmark.c
==============================================================================
--- branches/gnome-2-24/libnautilus-private/nautilus-bookmark.c	(original)
+++ branches/gnome-2-24/libnautilus-private/nautilus-bookmark.c	Fri Oct 17 17:24:33 2008
@@ -391,13 +391,19 @@
 	if (nautilus_file_is_gone (file) ||
 	    nautilus_file_is_in_trash (file)) {
 		/* The file we were monitoring has been trashed, deleted,
-		 * or moved in a way that we didn't notice. Make 
+		 * or moved in a way that we didn't notice. We should make 
 		 * a spanking new NautilusFile object for this 
 		 * location so if a new file appears in this place 
-		 * we will notice.
+		 * we will notice. However, we can't immediately do so
+		 * because creating a new NautilusFile directly as a result
+		 * of noticing a file goes away may trigger i/o on that file
+		 * again, noticeing it is gone, leading to a loop.
+		 * So, the new NautilusFile is created when the bookmark
+		 * is used again. However, this is not really a problem, as
+		 * we don't want to change the icon or anything about the
+		 * bookmark just because its not there anymore.
 		 */
 		nautilus_bookmark_disconnect_file (bookmark);
-		should_emit_appearance_changed_signal = TRUE;		
 	} else if (nautilus_bookmark_update_icon (bookmark)) {
 		/* File hasn't gone away, but it has changed
 		 * in a way that affected its icon.