pidgin.2.5.7: 84e969da: Manually apply revision 5c5977a6ed359112...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 84e969da4adf7a234522e144760511163e0de100
Ancestor: 09f4dcd3696fe0a17c93aefdd651fd0ce82949a4
Author: rekkanoryo at pidgin.im
Date: 2009-06-19T20:57:03
Branch: im.pidgin.pidgin.2.5.7
URL: http://d.pidgin.im/viewmtn/revision/info/84e969da4adf7a234522e144760511163e0de100

Modified files:
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_aliases.c

ChangeLog: 

Manually apply revision 5c5977a6ed3591121ef82ff587586850b9dcd176 here.  This
updates the yahoo prpl to use the new URL fetching function.

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo.c	af2b2e96c13f48c4e3f0242ea07e83156cce9325
+++ libpurple/protocols/yahoo/yahoo.c	51dd98ddbad96cde7e0737f58ba06ae2f539cf8a
@@ -1603,7 +1603,10 @@ static void yahoo_auth16_stage1_cb(Purpl
 				"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 @@ static void yahoo_auth16_stage1(PurpleCo
 	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 @@ static void yahoo_show_inbox(PurplePlugi
 		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);
============================================================
--- libpurple/protocols/yahoo/yahoo_aliases.c	8b6d4bbfa69c647fd56b71cc4fb3b0b4cdd60404
+++ libpurple/protocols/yahoo/yahoo_aliases.c	7de9314cab91e4c525e6f878dfaf97f93fe6db0d
@@ -175,9 +175,9 @@ yahoo_fetch_aliases(PurpleConnection *gc
 				  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 @@ yahoo_update_alias(PurpleConnection *gc,
 				  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);