aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-08-31 14:21:38 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-08-31 14:21:38 +0800
commitc2358c1b63d910b287aaaf5f770b79786b48a929 (patch)
tree9764e3cb5512be533cce82d8c5598cb6a22391f3
parentcc1f27817bb22842e02a8f1ce968c2b2ea0d6803 (diff)
downloadgsoc2013-evolution-c2358c1b63d910b287aaaf5f770b79786b48a929.tar.gz
gsoc2013-evolution-c2358c1b63d910b287aaaf5f770b79786b48a929.tar.zst
gsoc2013-evolution-c2358c1b63d910b287aaaf5f770b79786b48a929.zip
2007-08-31 mcrha Fix for bug #377763
svn path=/trunk/; revision=34145
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-icon-stream.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5ab9fc61d8..cdfa313ffd 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-31 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #377763
+
+ * em-icon-stream.c: (emis_fit): Do not scale under 1x1 pixel.
+
2007-08-31 Srinivasa Ragavan <sragavan@novell.com>
** Move away from g_assert to g_return* calls
diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c
index 538133be06..c1125b8877 100644
--- a/mail/em-icon-stream.c
+++ b/mail/em-icon-stream.c
@@ -180,6 +180,13 @@ emis_fit(GdkPixbuf *pixbuf, int maxwidth, int maxheight, int *scale)
height = maxheight;
}
+ /* check if we don't want to scale down too much, if so, do 1 pixel width/height */
+ if (width <= 0)
+ width = 1;
+
+ if (height <= 0)
+ height = 1;
+
#ifdef HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H
mini = gnome_thumbnail_scale_down_pixbuf(pixbuf, width, height);
#else