[evolution-patches] mail, 310840, /0 when resizing images

[Not Zed <notzed ximian com>]

simple

Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3673
diff -u -p -r1.3673 ChangeLog
--- mail/ChangeLog	4 Aug 2005 02:53:34 -0000	1.3673
+++ mail/ChangeLog	4 Aug 2005 05:02:54 -0000
@@ -1,3 +1,10 @@
+2005-08-04  Not Zed  <NotZed Ximian com>
+
+	** See bug #310840.
+
+	* em-icon-stream.c (em_icon_stream_get_image): check for /0
+	possibility.
+
 2005-08-03  Not Zed  <NotZed Ximian com>
 
 	* em-folder-browser.c (emfb_set_folder): not here.
Index: mail/em-icon-stream.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-icon-stream.c,v
retrieving revision 1.7
diff -u -p -r1.7 em-icon-stream.c
--- mail/em-icon-stream.c	6 Jul 2005 03:56:48 -0000	1.7
+++ mail/em-icon-stream.c	4 Aug 2005 05:02:54 -0000
@@ -285,7 +285,7 @@ em_icon_stream_get_image(const char *key
 			unsigned int scale;
 			char *realkey;
 
-			if (width >= height)
+			if (maxheight == 0 || width >= height)
 				scale = width * EMIS_SCALE / maxwidth;
 			else
 				scale = height * EMIS_SCALE / maxheight;