nautilus r14033 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Thu Apr  3 22:06:54 2008
New Revision: 14033
URL: http://svn.gnome.org/viewvc/nautilus?rev=14033&view=rev

Log:


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-bookmark.c

Modified: trunk/libnautilus-private/nautilus-bookmark.c
==============================================================================
--- trunk/libnautilus-private/nautilus-bookmark.c	(original)
+++ trunk/libnautilus-private/nautilus-bookmark.c	Thu Apr  3 22:06:54 2008
@@ -329,7 +329,7 @@
 	g_assert (new_icon != NULL);
 
 	if (bookmark->details->icon == NULL) {
-		return new_icon == NULL;
+		return TRUE;
 	}
 	
 	return !g_icon_equal (bookmark->details->icon, new_icon) != 0;
@@ -350,7 +350,8 @@
 		return FALSE;
 	}
 
-	if (nautilus_file_check_if_ready (bookmark->details->file,
+	if (!nautilus_file_is_not_yet_confirmed (bookmark->details->file) &&
+	    nautilus_file_check_if_ready (bookmark->details->file,
 					  NAUTILUS_FILE_ATTRIBUTES_FOR_ICON)) {
 		new_icon = nautilus_file_get_gicon (bookmark->details->file, 0);
 		if (nautilus_bookmark_icon_is_different (bookmark, new_icon)) {