From cda1baeb5b7c2cd08607629e4fd9d98fc48c5489 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 22 Mar 2001 06:07:31 +0000 Subject: Don't fail at setting up all the toolbar icons if just one of the icons cannot be loaded. svn path=/trunk/; revision=8880 --- mail/ChangeLog | 5 +++++ mail/folder-browser-factory.c | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index d5a9340342..51526591bd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-03-21 Ettore Perazzoli + + * folder-browser-factory.c (update_pixmaps): Don't return if + loading one image fails. + 2001-03-21 Dan Winship * mail-format.c (handle_multipart_related): Fix a bug in (illegal) diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 3ec1d27c0f..30766c8aa9 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -168,13 +168,10 @@ update_pixmaps (BonoboUIComponent *uic) pixbuf = gdk_pixbuf_new_from_file (path); if (pixbuf == NULL) { g_warning ("Cannot load image -- %s", path); - g_free (path); - return; + } else { + pixcache [i].pixbuf = bonobo_ui_util_pixbuf_to_xml (pixbuf); + gdk_pixbuf_unref (pixbuf); } - - pixcache [i].pixbuf = bonobo_ui_util_pixbuf_to_xml (pixbuf); - - gdk_pixbuf_unref (pixbuf); g_free (path); } -- cgit v1.2.3