changeset 16610:7135dd81991c

merge of '8bc9a8784cf40932a34e08e80f0d6585812b985a' and 'a35e9c6965a0723281ab3a62044581a55d2e59a2'
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 29 Apr 2007 01:10:48 +0000
parents 4eb08fcc16d8 (diff) ee8bb9b5acb8 (current diff)
children bb5c527cf143
files libpurple/buddyicon.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/buddyicon.c	Sun Apr 29 00:15:08 2007 +0000
+++ b/libpurple/buddyicon.c	Sun Apr 29 01:10:48 2007 +0000
@@ -721,7 +721,7 @@
 
 	if (old_img)
 		purple_imgstore_unref(old_img);
-	else
+	else if (old_icon)
 	{
 		/* The old icon may not have been loaded into memory.  In that
 		 * case, we'll need to uncache the filename.  The filenames