aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorSankar P <psankar@novell.com>2006-07-28 16:43:27 +0800
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2006-07-28 16:43:27 +0800
commitc1e35e5be188b7d664386ca89733786fe6e9a89f (patch)
tree803e2f3ef50d51518469702b48cacf92adf267a3 /mail
parent7ad62c2c8a31f7a2a9e89de61168a4309af56558 (diff)
downloadgsoc2013-evolution-c1e35e5be188b7d664386ca89733786fe6e9a89f.tar
gsoc2013-evolution-c1e35e5be188b7d664386ca89733786fe6e9a89f.tar.gz
gsoc2013-evolution-c1e35e5be188b7d664386ca89733786fe6e9a89f.tar.bz2
gsoc2013-evolution-c1e35e5be188b7d664386ca89733786fe6e9a89f.tar.lz
gsoc2013-evolution-c1e35e5be188b7d664386ca89733786fe6e9a89f.tar.xz
gsoc2013-evolution-c1e35e5be188b7d664386ca89733786fe6e9a89f.tar.zst
gsoc2013-evolution-c1e35e5be188b7d664386ca89733786fe6e9a89f.zip
committed on behalf of Srinivasa Ragavan <sragavan@novell.com> We dont
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 svn path=/trunk/; revision=32431
Diffstat (limited to 'mail')
-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;