Mercurial > pidgin
changeset 25626:8965e9730987
Manually apply revision 5c5977a6ed3591121ef82ff587586850b9dcd176 here. This
updates the yahoo prpl to use the new URL fetching function.
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Fri, 19 Jun 2009 20:57:03 +0000 |
| parents | 721e64d1ddfd |
| children | 22915096dbb3 |
| files | libpurple/protocols/yahoo/yahoo.c libpurple/protocols/yahoo/yahoo_aliases.c |
| diffstat | 2 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo.c Fri Jun 19 20:34:02 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Fri Jun 19 20:57:03 2009 +0000 @@ -1603,7 +1603,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); } @@ -1639,7 +1642,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); } @@ -3226,8 +3233,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);
--- a/libpurple/protocols/yahoo/yahoo_aliases.c Fri Jun 19 20:34:02 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_aliases.c Fri Jun 19 20:57:03 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);