diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-05-25 11:24:01 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-05-25 11:24:01 +0800 |
| commit | ce318c4d3a39f3c28843bb30890ef7713aba60fd (patch) | |
| tree | 3bd0a8aa2409bfea03f2bf28ddb40e3482e7f28c | |
| parent | 3057912b0a4a3e9cc806dfe663868039e46055cf (diff) | |
| download | gsoc2013-evolution-ce318c4d3a39f3c28843bb30890ef7713aba60fd.tar.gz gsoc2013-evolution-ce318c4d3a39f3c28843bb30890ef7713aba60fd.tar.zst gsoc2013-evolution-ce318c4d3a39f3c28843bb30890ef7713aba60fd.zip | |
if we have a cached icon, use it, don't just ignore it! #58831.
2004-05-25 Not Zed <NotZed@Ximian.com>
* e-msg-composer-attachment-bar.c (update): if we have a cached
icon, use it, don't just ignore it! #58831.
svn path=/trunk/; revision=26070
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment-bar.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 9532ede350..ce51c1bc75 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2004-05-25 Not Zed <NotZed@Ximian.com> + + * e-msg-composer-attachment-bar.c (update): if we have a cached + icon, use it, don't just ignore it! #58831. + 2004-05-19 JP Rosevear <jpr@novell.com> * Makefile.am: don't dist the error .h file diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index c8cf9b5e7b..ea953c83b3 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -226,14 +226,17 @@ update (EMsgComposerAttachmentBar *bar) EMsgComposerAttachment *attachment; CamelContentType *content_type; char *size_string, *label; - GdkPixbuf *pixbuf = NULL; + GdkPixbuf *pixbuf; const char *desc; attachment = p->data; content_type = camel_mime_part_get_content_type (attachment->body); /* Get the image out of the attachment and create a thumbnail for it */ - if (camel_content_type_is(content_type, "image", "*") && attachment->pixbuf_cache == NULL) { + pixbuf = attachment->pixbuf_cache; + if (pixbuf) { + g_object_ref(pixbuf); + } else if (camel_content_type_is(content_type, "image", "*")) { CamelDataWrapper *wrapper; CamelStreamMem *mstream; GdkPixbufLoader *loader; |