diff options
| author | Michael Meeks <michael@ximian.com> | 2002-08-21 12:07:25 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-08-21 12:07:25 +0000 |
| commit | c6ea83e743241b5a04fc985dbab30e87e0f76664 (patch) | |
| tree | 5db387b1691ac42920cde6b0e8fb7753edbb181c | |
| parent | 62375976695f0c17c9b8cbf631a2cf0f14d0ae82 (diff) | |
| download | nautilus-c6ea83e743241b5a04fc985dbab30e87e0f76664.tar.gz | |
fix in-icon svg rendering, also obey thumbnailing preferences for svg
2002-08-21 Michael Meeks <michael@ximian.com>
* libnautilus-private/nautilus-icon-factory.c
(nautilus_icon_factory_get_icon_for_file): fix
in-icon svg rendering, also obey thumbnailing
preferences for svg files (!).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.c | 12 |
2 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2002-08-21 Michael Meeks <michael@ximian.com> + + * libnautilus-private/nautilus-icon-factory.c + (nautilus_icon_factory_get_icon_for_file): fix + in-icon svg rendering, also obey thumbnailing + preferences for svg files (!). + 2002-08-20 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-link-desktop-file.c: diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 5c51b8530..0b3fa7e4f 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -1220,6 +1220,12 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie if (file_size < SELF_THUMBNAIL_SIZE_THRESHOLD && is_local && nautilus_gdk_pixbuf_supported (mime_type)) uri = nautilus_file_get_uri (file); + + if (uri == NULL && /* handle SVG files */ + !strcmp (mime_type, "image/svg")) { + uri = g_strdup (file_uri); + } + if (uri == NULL && strstr (file_uri, "/.thumbnails/") == NULL && file_size < cached_thumbnail_limit) { uri = nautilus_get_thumbnail_uri (file); @@ -1229,12 +1235,6 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie } } } - - /* handle SVG files */ - if (uri == NULL && icon_name == NULL - && nautilus_file_is_mime_type (file, "image/svg")) { - uri = g_strdup (file_uri); - } /* Get the generic icon set for this file. */ g_free (file_uri); |