From 44f24cdf5a76bd8b6288cfa94e275453565c92f0 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 5 Aug 2005 06:53:35 +0000 Subject: ** See bug #273885. 2005-08-04 Not Zed ** See bug #273885. * em-utils.c (em_utils_edit_filters): setup filter source names properly translated. * em-filter-editor.c (em_filter_editor_construct): take an array of structs for the filter source so the incoming/outgoing is properly translated. ** See bug #312397. * em-format-quote.c (emfq_format_message): dont quote credits here. (emfq_format_message_prefix): new prefix handler for credits. (emfq_format_clone): invoke the message prefix before anything else. ** See bug #310840. * em-icon-stream.c (em_icon_stream_get_image): check for /0 possibility. ** See bug #308512. * em-account-editor.c (emae_authtype_changed): take into account the writability of the password when sensitising remember password. (get_password): small hack to disable the save-password button when appropriate. svn path=/trunk/; revision=29997 --- mail/em-icon-stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-icon-stream.c') diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index b9079e8c02..3c975ffaef 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -285,7 +285,7 @@ em_icon_stream_get_image(const char *key, unsigned int maxwidth, unsigned int ma unsigned int scale; char *realkey; - if (width >= height) + if (maxheight == 0 || width >= height) scale = width * EMIS_SCALE / maxwidth; else scale = height * EMIS_SCALE / maxheight; -- cgit