Mercurial > pidgin.yaz
changeset 20244:d00e53fd9e88
applied changes from 1af4cc5be54c6712945771f62fb95bd07f4a6104
through b23d43806fbfeabc5007c65090195a3aa6c0a4d9
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 15:58:42 +0000 |
| parents | 5440eed4ec7e |
| children | 9a48e67fbfc8 |
| files | libpurple/protocols/oscar/family_auth.c libpurple/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_auth.c Fri Sep 28 15:57:10 2007 +0000 +++ b/libpurple/protocols/oscar/family_auth.c Fri Sep 28 15:58:42 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 Fri Sep 28 15:57:10 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Fri Sep 28 15:58:42 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) {