Mercurial > pidgin
changeset 20662:91a345965223
merge of 'b23d43806fbfeabc5007c65090195a3aa6c0a4d9'
and 'd0782be8e7c4cb4e98375f4b90f47a931e782ec0'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 26 Sep 2007 10:35:37 +0000 |
| parents | 408c4bb03915 (diff) a058621fcab1 (current diff) |
| children | 22034ce81dc4 324c25c2daad dc129248eb7c |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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) {