summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--libnautilus-private/nautilus-file.c8
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e9543c656..60e5ff732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-01 Alexander Larsson <alexl@redhat.com>
+
+ * libnautilus-private/nautilus-file.c (nautilus_file_invalidate_attributes_internal):
+ Don't invalidate attributes for NautilusDesktopIconFiles, since
+ they are always up to date (being in-memory objects). This fixes the
+ problem where the trash and/or home icons became unusable with the default
+ icon.
+
2003-08-29 Alexander Larsson <alexl@redhat.com>
* components/tree/nautilus-tree-view.c (theme_changed_callback):
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 539b7b1f8..a1bd0390b 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -5201,6 +5201,14 @@ nautilus_file_invalidate_attributes_internal (NautilusFile *file,
return;
}
+ if (NAUTILUS_IS_DESKTOP_ICON_FILE (file)) {
+ /* Desktop icon files are always up to date.
+ * If we invalidate their attributes they
+ * will lose data, so we just ignore them.
+ */
+ return;
+ }
+
nautilus_directory_set_up_request (&request, file_attributes);
if (request.directory_count) {