# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1190802937 0
# Node ID 91a3459652232c2c3106b4f012d8fc1285cd1dd3
# Parent  408c4bb039158d123c96ae1082d3b7bbc7f13638# Parent  a058621fcab1fb52de49ee47645d539b0ff48f3f
merge of 'b23d43806fbfeabc5007c65090195a3aa6c0a4d9'
     and 'd0782be8e7c4cb4e98375f4b90f47a931e782ec0'

diff -r a058621fcab1 -r 91a345965223 libpurple/protocols/oscar/family_auth.c
--- a/libpurple/protocols/oscar/family_auth.c	Wed Sep 26 09:21:42 2007 +0000
+++ b/libpurple/protocols/oscar/family_auth.c	Wed Sep 26 10:35:37 2007 +0000
@@ -438,10 +438,6 @@
  * login request instead of the normal SNAC one.
  *
  * As soon as AOL makes ICQ log in the same way as AIM, this is /gone/.
- *
- * XXX This may cause problems if the client relies on callbacks only
- * being called from the context of aim_rxdispatch()...
- *
  */
 static int
 goddamnicq(OscarData *od, FlapConnection *conn, const char *sn)
diff -r a058621fcab1 -r 91a345965223 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed Sep 26 09:21:42 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Sep 26 10:35:37 2007 +0000
@@ -1873,6 +1873,10 @@
 			saved_b16 = purple_buddy_icons_get_checksum_for_user(b);
 
 		if (!b16 || !saved_b16 || strcmp(b16, saved_b16)) {
+			/* Invalidate the old icon for this user */
+			purple_buddy_icons_set_for_user(account, info->sn, NULL, 0, NULL);
+
+			/* Fetch the new icon (if we're not already doing so) */
 			if (g_slist_find_custom(od->requesticon, info->sn,
 					(GCompareFunc)aim_sncmp) == NULL)
 			{