summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Sullivan <sullivan@src.gnome.org>2001-03-29 22:45:36 +0000
committerJohn Sullivan <sullivan@src.gnome.org>2001-03-29 22:45:36 +0000
commit661f4e24af74c8816031ac32652c636eba1bcb75 (patch)
tree85ba5d0c88e5525006a6dddefb953df36198ce2b
parentdae5ab52a74f88983e4cb3e03733952113c6d210 (diff)
downloadnautilus-661f4e24af74c8816031ac32652c636eba1bcb75.tar.gz
reviewed by: Darin Adler <darin@eazel.com>
Josh noticed that the special "thumbnail is loading" icon was no longer used. Darin and I found the problem. * libnautilus-extensions/nautilus-icon-factory.c: (nautilus_icon_factory_get_icon_for_file): Store URI rather than local path for special "loading" image.
-rw-r--r--ChangeLog11
-rw-r--r--libnautilus-extensions/nautilus-icon-factory.c4
-rw-r--r--libnautilus-private/nautilus-icon-factory.c4
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f26725711..436ae6eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-29 John Sullivan <sullivan@eazel.com>
+
+ reviewed by: Darin Adler <darin@eazel.com>
+
+ Josh noticed that the special "thumbnail is loading" icon
+ was no longer used. Darin and I found the problem.
+
+ * libnautilus-extensions/nautilus-icon-factory.c:
+ (nautilus_icon_factory_get_icon_for_file): Store URI rather
+ than local path for special "loading" image.
+
2001-03-29 Darin Adler <darin@eazel.com>
reviewed by: John Sullivan <sullivan@eazel.com>
diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c
index 85f2ca0a5..4bb3cd2ca 100644
--- a/libnautilus-extensions/nautilus-icon-factory.c
+++ b/libnautilus-extensions/nautilus-icon-factory.c
@@ -1416,9 +1416,11 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
&& file_size < cached_thumbnail_limit) {
uri = nautilus_get_thumbnail_uri (file, anti_aliased);
if (uri == NULL) {
- uri = get_icon_file_path
+ file_path = get_icon_file_path
(ICON_NAME_THUMBNAIL_LOADING, NULL,
NAUTILUS_ICON_SIZE_STANDARD, anti_aliased, NULL);
+ uri = gnome_vfs_get_uri_from_local_path (file_path);
+ g_free (file_path);
}
}
}
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 85f2ca0a5..4bb3cd2ca 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -1416,9 +1416,11 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
&& file_size < cached_thumbnail_limit) {
uri = nautilus_get_thumbnail_uri (file, anti_aliased);
if (uri == NULL) {
- uri = get_icon_file_path
+ file_path = get_icon_file_path
(ICON_NAME_THUMBNAIL_LOADING, NULL,
NAUTILUS_ICON_SIZE_STANDARD, anti_aliased, NULL);
+ uri = gnome_vfs_get_uri_from_local_path (file_path);
+ g_free (file_path);
}
}
}