From 920f112a95118279b8d6b1430a059ad64dba4180 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Mon, 1 Jun 2009 10:17:58 +0200 Subject: [PATCH] Properly handle missing icons in folder view. --- src/widgets/modest-folder-view.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 3f39ee1..2c4d531 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -918,15 +918,20 @@ get_composite_icons (const gchar *icon_code, { ThreePixbufs *retval; - if (!*pixbuf) - *pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE)); + if (!*pixbuf) { + GdkPixbuf *icon; + icon = modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE); + if (icon) { + *pixbuf = gdk_pixbuf_copy (icon); + } + } - if (!*pixbuf_open) + if (!*pixbuf_open && pixbuf && *pixbuf) *pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp", FOLDER_ICON_SIZE, *pixbuf); - if (!*pixbuf_close) + if (!*pixbuf_close && pixbuf && *pixbuf) *pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp", FOLDER_ICON_SIZE, *pixbuf); -- 1.7.9.5