Mercurial > pidgin.yaz

changeset 22039:9c367aabb49e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 'a5456268d56c1a4745ac4abb84a176ecc6f68109' and 'eaa01cc61dc67594e3f946e2b119f01ef4177d3e'
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 08 Jan 2008 03:00:20 +0000
parents 0b297184de17 (diff) 13d290879e0a (current diff)
children 72712558e2be
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/buddyicon.c	Tue Jan 08 01:18:10 2008 +0000
+++ b/libpurple/buddyicon.c	Tue Jan 08 03:00:20 2008 +0000
@@ -625,7 +625,7 @@
 		purple_buddy_icons_set_caching(caching);
 	}
 
-	return purple_buddy_icon_ref(icon);
+	return (icon ? purple_buddy_icon_ref(icon) : nil);
 }
 
 gboolean