aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-icon-stream.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2739f1e006..6384a5ed72 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-28 Sankar P <psankar@novell.com>
+
+ * committed on behalf of Srinivasa Ragavan <sragavan@novell.com>
+ * em-icon-stream.c: (emis_fit):
+ We dont scale on height if the maxheight is zero
+ Fixes 335431
+
2006-07-26 Veerapuram Varadhan <vvaradhan@novell.com>
** Fixes bgo bug #333821 and bnc bug 181851
diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c
index 3c975ffaef..7fc69dbaa6 100644
--- a/mail/em-icon-stream.c
+++ b/mail/em-icon-stream.c
@@ -168,7 +168,7 @@ emis_fit(GdkPixbuf *pixbuf, int maxwidth, int maxheight, int *scale)
if ((maxwidth && width > maxwidth)
|| (maxheight && height > maxheight)) {
- if (width >= height) {
+ if (width >= height || maxheight == 0) {
if (scale)
*scale = maxwidth * EMIS_SCALE / width;
height = height * maxwidth / width;