diff options
author | John Bailey <rekkanoryo@rekkanoryo.org> | 2009-06-19 20:57:03 +0000 |
---|---|---|
committer | John Bailey <rekkanoryo@rekkanoryo.org> | 2009-06-19 20:57:03 +0000 |
commit | 1cfcbd949c4e57c0e71dbbcf57460d7601dc9fe5 (patch) | |
tree | 30a389fc59e4ff7b9854518ecb2da74a6aea2608 | |
parent | cbc3e2d580b46b2a94565888a2f4061531386af1 (diff) | |
download | pidgin-1cfcbd949c4e57c0e71dbbcf57460d7601dc9fe5.tar.gz |
Manually apply revision 5c5977a6ed3591121ef82ff587586850b9dcd176 here. This
updates the yahoo prpl to use the new URL fetching function.
-rw-r--r-- | libpurple/protocols/yahoo/yahoo.c | 16 | ||||
-rw-r--r-- | libpurple/protocols/yahoo/yahoo_aliases.c | 10 |
2 files changed, 18 insertions, 8 deletions
diff --git a/libpurple/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/yahoo.c index d0ae8a5401..d34ea9c6f3 100644 --- a/libpurple/protocols/yahoo/yahoo.c +++ b/libpurple/protocols/yahoo/yahoo.c @@ -1603,7 +1603,10 @@ static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user "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(PurpleConnection *gc, const char *seed) 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(PurplePluginAction *action) 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); diff --git a/libpurple/protocols/yahoo/yahoo_aliases.c b/libpurple/protocols/yahoo/yahoo_aliases.c index 47b2ea78fb..b2ecb2616c 100644 --- a/libpurple/protocols/yahoo/yahoo_aliases.c +++ b/libpurple/protocols/yahoo/yahoo_aliases.c @@ -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, const char *who, const char *alias) 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); |