From ed19a4c736516d37505728cc728e8831c50b5e94 Mon Sep 17 00:00:00 2001 From: Andy Hertzfeld Date: Tue, 12 Dec 2000 22:06:47 +0000 Subject: fixed bug 4212, emblem doesn't show up when the image is a JPEG file, by * libnautilus-extensions/nautilus-icon-factory.c: (cache_icon_new), (load_icon_for_scaling), (scale_icon), (get_icon_from_cache), (nautilus_icon_factory_get_pixbuf_for_icon), (nautilus_icon_factory_get_pixbuf_for_file): fixed bug 4212, emblem doesn't show up when the image is a JPEG file, by adding ".jpg" to extensions checked in the icon factory. Fixed bug 3208, generic icon shows up for deleted emblems, by adding a "wants_default" parameter to the icon factory get_pixbuf_for_icon call. If "wants_default" is false, it returns NULL instead of the generic icon. Emblem callers pass FALSE so they don't get pixmaps for deleted emblems. * libnautilus-extensions/nautilus-bookmark.c: (nautilus_bookmark_get_pixbuf): added boolean parameter to get_pixbuf_for_icon call * libnautilus-extensions/nautilus-icon-container.c: (nautilus_icon_container_update_icon): added boolean parameter to get_pixbuf_for_icon call * libnautilus-extensions/nautilus-icon-factory.h: added "wants_default" boolean to get_pixbuf_for_icon definition * src/file-manager/fm-list-view.c: (fm_list_view_get_emblem_pixbufs_for_file): added boolean parameter to get_pixbuf_for_icon call * src/file-manager/fm-properties-window.c: (create_image_widget_for_emblem): added boolean parameter to get_pixbuf_for_icon call * src/nautilus-sidebar-title.c: (update_emblems): added boolean parameter to get_pixbuf_for_icon call --- libnautilus-private/nautilus-bookmark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libnautilus-private/nautilus-bookmark.c') diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index 5634dd0cd..2644e165f 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/nautilus-bookmark.c @@ -234,7 +234,7 @@ nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark, } result = nautilus_icon_factory_get_pixbuf_for_icon - (icon, icon_size, icon_size, icon_size, icon_size, NULL); + (icon, icon_size, icon_size, icon_size, icon_size, NULL, TRUE); nautilus_scalable_icon_unref (icon); return result; -- cgit v1.2.1