Mercurial > pidgin.yaz
changeset 27071:077eae6f3d84
Update the yahoo prpl to use the new function I added. This should fix the
issue in Adium's ticket 12231.
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 30 May 2009 00:58:04 +0000 |
| parents | bc01e0789404 |
| children | 68d6c6517ef8 85a4c248f751 |
| files | libpurple/protocols/yahoo/yahoo.c libpurple/protocols/yahoo/yahoo_aliases.c |
| diffstat | 2 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo.c Sat May 30 00:34:56 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Sat May 30 00:58:04 2009 +0000 @@ -1790,7 +1790,10 @@ "yahoojp", 0); url = g_strdup_printf(yahoojp ? YAHOOJP_LOGIN_URL : YAHOO_LOGIN_URL, token); - url_data = purple_util_fetch_url_request(url, TRUE, YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, yahoo_auth16_stage2, auth_data); + url_data = purple_util_fetch_url_request_len_with_account( + purple_connection_get_account(gc), url, TRUE, + YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1, + yahoo_auth16_stage2, auth_data); g_free(url); g_free(token); } @@ -1826,7 +1829,11 @@ g_free(encoded_password); g_free(encoded_username); - url_data = purple_util_fetch_url_request(url, TRUE, YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, yahoo_auth16_stage1_cb, auth_data); + url_data = purple_util_fetch_url_request_len_with_account( + purple_connection_get_account(gc), url, TRUE, + YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1, + yahoo_auth16_stage1_cb, auth_data); + g_free(url); } @@ -3948,8 +3955,9 @@ use_whole_url ? base_url : "", yd->cookie_t, yd->cookie_y); - url_data = purple_util_fetch_url_request(base_url, use_whole_url, - YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, + url_data = purple_util_fetch_url_request_len_with_account( + purple_connection_get_account(gc), base_url, use_whole_url, + YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1, yahoo_get_inbox_token_cb, gc); g_free(request); @@ -4110,8 +4118,9 @@ if ((gc->account->proxy_info) && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP)) use_whole_url = TRUE; - url_data = purple_util_fetch_url_request(YAHOO_SMS_CARRIER_URL, use_whole_url, - YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, + url_data = purple_util_fetch_url_request_len_with_account( + purple_connection_get_account(gc), YAHOO_SMS_CARRIER_URL, use_whole_url, + YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1, yahoo_get_sms_carrier_cb, data); g_free(request);
--- a/libpurple/protocols/yahoo/yahoo_aliases.c Sat May 30 00:34:56 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_aliases.c Sat May 30 00:58:04 2009 +0000 @@ -175,9 +175,9 @@ webaddress); /* We have a URL and some header information, let's connect and get some aliases */ - url_data = purple_util_fetch_url_request(url, use_whole_url, NULL, TRUE, - request, FALSE, - yahoo_fetch_aliases_cb, cb); + url_data = purple_util_fetch_url_request_len_with_account(purple_connection_get_account(gc), + url, use_whole_url, NULL, TRUE, request, FALSE, -1, + yahoo_fetch_aliases_cb, cb); if (url_data != NULL) yd->url_datas = g_slist_prepend(yd->url_datas, url_data); @@ -347,7 +347,9 @@ content); /* We have a URL and some header information, let's connect and update the alias */ - url_data = purple_util_fetch_url_request(url, use_whole_url, NULL, TRUE, request, FALSE, yahoo_update_alias_cb, cb); + url_data = purple_util_fetch_url_request_len_with_account( + purple_connection_get_account(gc), url, use_whole_url, NULL, TRUE, + request, FALSE, -1, yahoo_update_alias_cb, cb); if (url_data != NULL) yd->url_datas = g_slist_prepend(yd->url_datas, url_data);