aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2008-03-03 18:21:13 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2008-03-03 18:21:13 +0800
commite6152ff390a0f048d86c8e818716a46e1abc7c6e (patch)
tree1e7a260db8aeab369854aee427b488fe70d62090
parent0f6bc6e164e512fa0817be96bcf753280cb3486b (diff)
downloadgsoc2013-evolution-e6152ff390a0f048d86c8e818716a46e1abc7c6e.tar.gz
gsoc2013-evolution-e6152ff390a0f048d86c8e818716a46e1abc7c6e.tar.zst
gsoc2013-evolution-e6152ff390a0f048d86c8e818716a46e1abc7c6e.zip
** Fix for BNC bug #282466
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. svn path=/trunk/; revision=35116
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-icon-stream.c10
2 files changed, 15 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 523295efc8..4a0f802b4a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2008-03-03 Changwoo Ryu <cwryu@debian.org>
* default/Makefile.am:
diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c
index 9f698e2c54..4f7a369d7e 100644
--- a/mail/em-icon-stream.c
+++ b/mail/em-icon-stream.c
@@ -262,10 +262,13 @@ em_icon_stream_new(GtkImage *image, const char *key, unsigned int maxwidth, unsi
}
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 @@ em_icon_stream_get_image(const char *key, unsigned int maxwidth, unsigned int ma
}
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();