Mercurial > pidgin.yaz

changeset 9261:77fdeb4c459f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10060] Fix a small design flaw that prevented buddy icons in the blist and conv window from updating sometimes. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Fri, 11 Jun 2004 00:11:52 +0000
parents 947876140943
children 572e4658492c
files src/blist.c src/conversation.c
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/blist.c	Fri Jun 11 00:08:29 2004 +0000
+++ b/src/blist.c	Fri Jun 11 00:11:52 2004 +0000
@@ -553,15 +553,15 @@
 {
 	g_return_if_fail(buddy != NULL);
 
-	if (buddy->icon == icon)
-		return;
-
-	if (buddy->icon != NULL)
-		gaim_buddy_icon_unref(buddy->icon);
-
-	buddy->icon = (icon == NULL ? NULL : gaim_buddy_icon_ref(icon));
-
-	gaim_buddy_icon_cache(icon, buddy);
+	if (buddy->icon != icon)
+	{
+		if (buddy->icon != NULL)
+			gaim_buddy_icon_unref(buddy->icon);
+
+		buddy->icon = (icon == NULL ? NULL : gaim_buddy_icon_ref(icon));
+
+		gaim_buddy_icon_cache(icon, buddy);
+	}
 
 	gaim_blist_update_buddy_icon(buddy);
 }
--- a/src/conversation.c	Fri Jun 11 00:08:29 2004 +0000
+++ b/src/conversation.c	Fri Jun 11 00:11:52 2004 +0000
@@ -1559,13 +1559,13 @@
 {
 	g_return_if_fail(im != NULL);
 
-	if (im->icon == icon)
-		return;
-
-	if (im->icon != NULL)
-		gaim_buddy_icon_unref(im->icon);
-
-	im->icon = (icon == NULL ? NULL : gaim_buddy_icon_ref(icon));
+	if (im->icon != icon)
+	{
+		if (im->icon != NULL)
+			gaim_buddy_icon_unref(im->icon);
+
+		im->icon = (icon == NULL ? NULL : gaim_buddy_icon_ref(icon));
+	}
 
 	gaim_conversation_update(gaim_conv_im_get_conversation(im),
 							 GAIM_CONV_UPDATE_ICON);