X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=2c4d531b301695811ba034dc9cb6e001f4fce789;hp=3f39ee10395cc6ce1ba357e9c6ab475eabef7e34;hb=920f112a95118279b8d6b1430a059ad64dba4180;hpb=e7d49a2f1e83eb5b8035b416b00230e12213a0ee

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);