Mercurial > pidgin.yaz

changeset 14486:d85f326af28d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17205] Rest of SF Patch #1554627 from Richard Nelson (wabz) "a user without an msnobject was having icon_checksum removed on each status change" committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Sat, 09 Sep 2006 20:47:12 +0000
parents c02ef8dd4416
children 87e66ad0a4dd
files libgaim/protocols/msn/slp.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/msn/slp.c	Sat Sep 09 20:40:12 2006 +0000
+++ b/libgaim/protocols/msn/slp.c	Sat Sep 09 20:47:12 2006 +0000
@@ -954,18 +954,19 @@
 		/* It seems the user has not set a msnobject */
 		GSList *sl, *list;
 
-		/* TODO: I think we need better buddy icon core functions. */
-		gaim_buddy_icons_set_for_user(account, user->passport, NULL, -1);
-
 		list = gaim_find_buddies(account, user->passport);
 
 		for (sl = list; sl != NULL; sl = sl->next)
 		{
 			GaimBuddy *buddy = (GaimBuddy *)sl->data;
-			gaim_blist_node_remove_setting((GaimBlistNode*)buddy, "icon_checksum");
+			if (buddy->icon)
+				gaim_blist_node_remove_setting((GaimBlistNode*)buddy, "icon_checksum");
 		}
 		g_slist_free(list);
 
+		/* TODO: I think we need better buddy icon core functions. */
+		gaim_buddy_icons_set_for_user(account, user->passport, NULL, 0);
+
 		return;
 	}