evolution r35116 - trunk/mail

[sragavan svn gnome org]

Author: sragavan
Date: Mon Mar  3 10:21:13 2008
New Revision: 35116
URL: http://svn.gnome.org/viewvc/evolution?rev=35116&view=rev

Log:
2008-03-03  Srinivasa Ragavan  <sragavan novell com>

	** Fix for BNC bug #282466

	* em-icon-stream.c: (em_icon_stream_get_image),
	(em_icon_stream_is_resized): Handle CIDs of broken cases too.




Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-icon-stream.c

Modified: trunk/mail/em-icon-stream.c
==============================================================================
--- trunk/mail/em-icon-stream.c	(original)
+++ trunk/mail/em-icon-stream.c	Mon Mar  3 10:21:13 2008
@@ -262,10 +262,13 @@
 }
 
 GdkPixbuf *
-em_icon_stream_get_image(const char *key, unsigned int maxwidth, unsigned int maxheight)
+em_icon_stream_get_image(const char *tkey, unsigned int maxwidth, unsigned int maxheight)
 {
 	struct _emis_cache_node *node;
 	GdkPixbuf *pb = NULL;
+	const char *key;
+
+	key = tkey ? tkey : "";
 
 	/* forces the cache to be setup if not */
 	em_icon_stream_get_type();
@@ -316,10 +319,13 @@
 }
 
 int
-em_icon_stream_is_resized(const char *key, unsigned int maxwidth, unsigned int maxheight)
+em_icon_stream_is_resized(const char *tkey, unsigned int maxwidth, unsigned int maxheight)
 {
 	int res = FALSE;
 	struct _emis_cache_node *node;
+	const char *key;
+
+	key = tkey ? tkey : "";
 
 	/* forces the cache to be setup if not */
 	em_icon_stream_get_type();