Mercurial > pidgin.yaz
changeset 4807:3f44efdfb4cf
[gaim-migrate @ 5127]
Well that was fun
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 17 Mar 2003 04:27:19 +0000 |
| parents | 315ef59a5031 |
| children | 506141e196dc |
| files | src/protocols/oscar/info.c src/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/info.c Mon Mar 17 04:19:24 2003 +0000 +++ b/src/protocols/oscar/info.c Mon Mar 17 04:27:19 2003 +0000 @@ -624,7 +624,7 @@ * about the buddy icon that the user has stored on * the server. */ - char *iconstr; +/* char *iconstr; outinfo->iconstrlen = length-4; outinfo->iconstrlen -= aim_bstream_advance(bs, aimbs_get16(bs)); outinfo->iconstrlen -= aim_bstream_advance(bs, aimbs_get16(bs)); @@ -633,7 +633,8 @@ memcpy(outinfo->iconstr, iconstr, outinfo->iconstrlen); } else outinfo->iconstrlen = 0; - free(iconstr); + free(iconstr); */ + outinfo->iconstrlen = 0; } else if (type == 0x001e) { /*
--- a/src/protocols/oscar/oscar.c Mon Mar 17 04:19:24 2003 +0000 +++ b/src/protocols/oscar/oscar.c Mon Mar 17 04:27:19 2003 +0000 @@ -1755,9 +1755,9 @@ if (od->icontimer) g_source_remove(od->icontimer); od->icontimer = g_timeout_add(500, gaim_icon_timerfunc, gc); + memcpy(bi->iconstr, info->iconstr, info->iconstrlen); } bi->iconstrlen = info->iconstrlen; - memcpy(bi->iconstr, info->iconstr, info->iconstrlen); serv_got_update(gc, info->sn, 1, info->warnlevel/10, signon, time_idle, type);