Mercurial > pidgin
comparison libpurple/protocols/jabber/useravatar.c @ 32819:2c6510167895 default tip
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24)
to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 02 Jun 2012 02:30:49 +0000 |
| parents | 904686722499 |
| children |
comparison
equal
deleted
inserted
replaced
| 32818:01ff09d4a463 | 32819:2c6510167895 |
|---|---|
| 375 } else { | 375 } else { |
| 376 PurpleUtilFetchUrlData *url_data; | 376 PurpleUtilFetchUrlData *url_data; |
| 377 JabberBuddyAvatarUpdateURLInfo *info = g_new0(JabberBuddyAvatarUpdateURLInfo, 1); | 377 JabberBuddyAvatarUpdateURLInfo *info = g_new0(JabberBuddyAvatarUpdateURLInfo, 1); |
| 378 info->js = js; | 378 info->js = js; |
| 379 | 379 |
| 380 url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE, | 380 url_data = purple_util_fetch_url(url, TRUE, NULL, TRUE, |
| 381 MAX_HTTP_BUDDYICON_BYTES, | 381 MAX_HTTP_BUDDYICON_BYTES, |
| 382 do_buddy_avatar_update_fromurl, info); | 382 do_buddy_avatar_update_fromurl, info); |
| 383 if (url_data) { | 383 if (url_data) { |
| 384 info->from = g_strdup(from); | 384 info->from = g_strdup(from); |
| 385 info->id = g_strdup(id); | 385 info->id = g_strdup(id); |