# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1177876094 0
# Node ID 64ce75d3efd43ab49917619b6073464f4e7fe8ba
# Parent  ce124db89c493dd8bd07823d5dca69634616f3d1# Parent  df5fb079b1ad7acaaa070d1c8b6efc76ba190c86
merge of '3e6c08926429636e5eadf17843abfe92b855e24b'
     and '5b88699a08a051f63111f06a71fb6735fac2a568'

diff -r ce124db89c49 -r 64ce75d3efd4 libpurple/buddyicon.c
--- a/libpurple/buddyicon.c	Sun Apr 29 18:22:07 2007 +0000
+++ b/libpurple/buddyicon.c	Sun Apr 29 19:48:14 2007 +0000
@@ -854,7 +854,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