diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-03-22 14:07:31 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-03-22 14:07:31 +0800 |
| commit | cda1baeb5b7c2cd08607629e4fd9d98fc48c5489 (patch) | |
| tree | b8516a3ea24a664312bcf97f88c518d5bef70c8f | |
| parent | aedb33b3af7c5c01aa220fe3ab51a111a31c8922 (diff) | |
| download | gsoc2013-evolution-cda1baeb5b7c2cd08607629e4fd9d98fc48c5489.tar gsoc2013-evolution-cda1baeb5b7c2cd08607629e4fd9d98fc48c5489.tar.gz gsoc2013-evolution-cda1baeb5b7c2cd08607629e4fd9d98fc48c5489.tar.bz2 gsoc2013-evolution-cda1baeb5b7c2cd08607629e4fd9d98fc48c5489.tar.lz gsoc2013-evolution-cda1baeb5b7c2cd08607629e4fd9d98fc48c5489.tar.xz gsoc2013-evolution-cda1baeb5b7c2cd08607629e4fd9d98fc48c5489.tar.zst gsoc2013-evolution-cda1baeb5b7c2cd08607629e4fd9d98fc48c5489.zip | |
Don't fail at setting up all the toolbar icons if just one of the
icons cannot be loaded.
svn path=/trunk/; revision=8880
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <ettore@ximian.com> + + * folder-browser-factory.c (update_pixmaps): Don't return if + loading one image fails. + 2001-03-21 Dan Winship <danw@ximian.com> * 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); } |