pidgin: 112f4162: Rename purple_util_fetch_url_request_len...
markdoliner at pidgin.im
markdoliner at pidgin.im
Sat Aug 20 22:00:32 EDT 2011
----------------------------------------------------------------------
Revision: 112f4162ac9fa90ad23dd6dd980da6a804986890
Parent: 5db1106bdb10e0920aaff6731e23e01fffe49ecc
Author: markdoliner at pidgin.im
Date: 08/20/11 21:59:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/112f4162ac9fa90ad23dd6dd980da6a804986890
Changelog:
Rename purple_util_fetch_url_request_len_with_account to
purple_util_fetch_url_request_len
Changes against parent 5db1106bdb10e0920aaff6731e23e01fffe49ecc
patched ChangeLog.API
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/oscar/clientlogin.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/protocols/yahoo/yahoo_aliases.c
patched libpurple/upnp.c
patched libpurple/util.c
patched libpurple/util.h
patched pidgin/plugins/relnot.c
-------------- next part --------------
============================================================
--- libpurple/util.c 62f1dadd479b069a160bcba2b0894dda4e1ceaea
+++ libpurple/util.c 3cb82314f944d42ba17a5353dae6be6290c9f196
@@ -4108,14 +4108,14 @@ purple_util_fetch_url_request(const char
const char *request, gboolean include_headers,
PurpleUtilFetchUrlCallback callback, void *user_data)
{
- return purple_util_fetch_url_request_len_with_account(NULL, url, full,
+ return purple_util_fetch_url_request_len(NULL, url, full,
user_agent, http11,
request, include_headers, -1,
callback, user_data);
}
PurpleUtilFetchUrlData *
-purple_util_fetch_url_request_len_with_account(PurpleAccount *account,
+purple_util_fetch_url_request_len(PurpleAccount *account,
const char *url, gboolean full, const char *user_agent, gboolean http11,
const char *request, gboolean include_headers, gssize max_len,
PurpleUtilFetchUrlCallback callback, void *user_data)
============================================================
--- libpurple/protocols/gg/gg.c 5e9b88cdf880b02c07006ea2545301ffb9460fdc
+++ libpurple/protocols/gg/gg.c 54b48accfaa54546037cbe490a5057dfc5659ca7
@@ -1024,7 +1024,7 @@ static void gg_get_avatar_url_cb(PurpleU
purple_debug_info("gg", "gg_get_avatar_url_cb: "
"requesting avatar for %s\n", uin);
- url_data = purple_util_fetch_url_request_len_with_account(account,
+ url_data = purple_util_fetch_url_request_len(account,
bigavatar, TRUE, "Mozilla/4.0 (compatible; MSIE 5.0)",
FALSE, NULL, FALSE, -1, gg_fetch_avatar_cb, data);
}
@@ -1052,7 +1052,7 @@ static void ggp_update_buddy_avatar(Purp
avatarurl = g_strdup_printf("http://api.gadu-gadu.pl/avatars/%u/0.xml", uin);
- url_data = purple_util_fetch_url_request_len_with_account(
+ url_data = purple_util_fetch_url_request_len(
purple_connection_get_account(gc), avatarurl, TRUE,
"Mozilla/4.0 (compatible; MSIE 5.5)", FALSE, NULL, FALSE, -1,
gg_get_avatar_url_cb, gc);
============================================================
--- libpurple/protocols/yahoo/libymsg.c f4cecd2fd4f8f4167f259cdcf6d80fdc660108f9
+++ libpurple/protocols/yahoo/libymsg.c 7a64ff71a5ef64295f68cfc3e49a4c0c9af7c19f
@@ -2014,7 +2014,7 @@ static void yahoo_auth16_stage1_cb(Purpl
gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
url = g_strdup_printf(yahoojp ? YAHOOJP_LOGIN_URL : YAHOO_LOGIN_URL, token);
- url_data = purple_util_fetch_url_request_len_with_account(
+ url_data = purple_util_fetch_url_request_len(
proxy_ssl ? account : NULL, url, TRUE, YAHOO_CLIENT_USERAGENT,
TRUE, NULL, TRUE, -1, yahoo_auth16_stage2, auth_data);
if (url_data)
@@ -2055,7 +2055,7 @@ static void yahoo_auth16_stage1(PurpleCo
g_free(encoded_password);
g_free(encoded_username);
- url_data = purple_util_fetch_url_request_len_with_account(
+ url_data = purple_util_fetch_url_request_len(
proxy_ssl ? account : NULL, url, TRUE,
YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1,
yahoo_auth16_stage1_cb, auth_data);
@@ -3708,7 +3708,7 @@ void yahoo_login(PurpleAccount *account)
/* Get the pager server. Actually start connecting in the callback since we
* must have the contents of the HTTP response to proceed. */
- url_data = purple_util_fetch_url_request_len_with_account(
+ url_data = purple_util_fetch_url_request_len(
proxy_ssl ? purple_connection_get_account(gc) : NULL,
yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL,
use_whole_url ? TRUE : FALSE,
@@ -4296,7 +4296,7 @@ static void yahoo_show_inbox(PurplePlugi
use_whole_url ? base_url : "",
yd->cookie_t, yd->cookie_y);
- url_data = purple_util_fetch_url_request_len_with_account(
+ url_data = purple_util_fetch_url_request_len(
purple_connection_get_account(gc), base_url, use_whole_url,
YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
yahoo_get_inbox_token_cb, gc);
@@ -4488,7 +4488,7 @@ static void yahoo_get_sms_carrier(Purple
if ((gc->account->proxy_info) && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP))
use_whole_url = TRUE;
- url_data = purple_util_fetch_url_request_len_with_account(
+ url_data = purple_util_fetch_url_request_len(
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);
============================================================
--- libpurple/util.h dbca0be32d84f2c35eb241822fe8fabcc86f99a2
+++ libpurple/util.h 33b54e27035ba297bb0a7cdcb156a63a3563b895
@@ -1138,7 +1138,7 @@ typedef void (*PurpleUtilFetchUrlCallbac
* @deprecated In 3.0.0, we'll rename this to "purple_util_fetch_url" and get rid of the old one
*/
#define purple_util_fetch_url_len(url, full, user_agent, http11, max_len, cb, data) \
- purple_util_fetch_url_request_len_with_account(NULL, url, full, user_agent, http11, NULL, \
+ purple_util_fetch_url_request_len(NULL, url, full, user_agent, http11, NULL, \
FALSE, max_len, cb, data);
/**
@@ -1178,7 +1178,7 @@ PurpleUtilFetchUrlData *purple_util_fetc
* @param callback The callback function.
* @param data The user data to pass to the callback function.
*/
-PurpleUtilFetchUrlData *purple_util_fetch_url_request_len_with_account(
+PurpleUtilFetchUrlData *purple_util_fetch_url_request_len(
PurpleAccount *account, const gchar *url,
gboolean full, const gchar *user_agent, gboolean http11,
const gchar *request, gboolean include_headers, gssize max_len,
============================================================
--- pidgin/plugins/relnot.c e405c3295c27fa1c1d75557cd33d5417d6d3fe56
+++ pidgin/plugins/relnot.c 30675a6b92b8487e3947b1cfe7b4c63bfc54e2a8
@@ -152,7 +152,7 @@ do_check(void)
url,
host);
- purple_util_fetch_url_request_len_with_account(NULL, url, TRUE, NULL, FALSE,
+ purple_util_fetch_url_request_len(NULL, url, TRUE, NULL, FALSE,
request, TRUE, -1, version_fetch_cb, NULL);
g_free(request);
============================================================
--- ChangeLog.API eac26f0a8103f5ea435fb9451abc94c3a9c840e7
+++ ChangeLog.API 9bf90ff6e7c34f12a6872cdf008026c90bb549d3
@@ -8,6 +8,10 @@ version 3.0.0 (??/??/????):
* purple_request_field_set_tooltip
* purple_request_field_get_tooltip
+ Changed:
+ * purple_util_fetch_url_request_len now takes a PurpleAccount as
+ the first parameter
+
Removed:
* purple_core_migrate
* purple_notify_searchresults_column_get_title
@@ -18,6 +22,8 @@ version 3.0.0 (??/??/????):
* purple_status_type_set_primary_attr
* purple_strlcat
* purple_strlcpy
+ * purple_util_fetch_url_request_len_with_account. Use
+ purple_util_fetch_url_request_len, insetad.
version 2.10.0:
libpurple:
============================================================
--- libpurple/upnp.c 9ff39806e001d3cf4f0dc4ef7860bd48853de69d
+++ libpurple/upnp.c 590b03ea3ded09c276877e51c4a8b69100f58005
@@ -464,7 +464,7 @@ purple_upnp_parse_description(const gcha
purple_timeout_remove(dd->tima);
dd->tima = 0;
- purple_util_fetch_url_request_len_with_account(NULL, descriptionURL, TRUE, NULL, TRUE, httpRequest,
+ purple_util_fetch_url_request_len(NULL, descriptionURL, TRUE, NULL, TRUE, httpRequest,
TRUE, MAX_UPNP_DOWNLOAD, upnp_parse_description_cb, dd);
g_free(httpRequest);
@@ -730,7 +730,7 @@ purple_upnp_generate_action_message_and_
g_free(pathOfControl);
g_free(soapMessage);
- gfud = purple_util_fetch_url_request_len_with_account(NULL, control_info.control_url, FALSE, NULL, TRUE,
+ gfud = purple_util_fetch_url_request_len(NULL, control_info.control_url, FALSE, NULL, TRUE,
totalSendMessage, TRUE, MAX_UPNP_DOWNLOAD, cb, cb_data);
g_free(totalSendMessage);
============================================================
--- libpurple/protocols/yahoo/yahoo_aliases.c 6d631818783d2a991c3f3974da861a5f2c6943d8
+++ libpurple/protocols/yahoo/yahoo_aliases.c 6712e727d06848af814aa979d4cca5bcc2e09580
@@ -207,7 +207,7 @@ 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_len_with_account(purple_connection_get_account(gc),
+ url_data = purple_util_fetch_url_request_len(purple_connection_get_account(gc),
url, use_whole_url, NULL, TRUE, request, FALSE, -1,
yahoo_fetch_aliases_cb, gc);
if (url_data != NULL)
@@ -379,7 +379,7 @@ 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_len_with_account(
+ url_data = purple_util_fetch_url_request_len(
purple_connection_get_account(gc), url, use_whole_url, NULL, TRUE,
request, FALSE, -1, yahoo_update_alias_cb, cb);
if (url_data != NULL)
@@ -517,7 +517,7 @@ yahoo_set_userinfo_cb(PurpleConnection *
}
#endif
- url_data = purple_util_fetch_url_request_len_with_account(account, webaddress, FALSE,
+ url_data = purple_util_fetch_url_request_len(account, webaddress, FALSE,
YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
yahoo_fetch_aliases_cb, gc);
if (url_data != NULL)
============================================================
--- libpurple/protocols/oscar/clientlogin.c 30188d491ff7cf374cab732632f12a63b2ef4c5d
+++ libpurple/protocols/oscar/clientlogin.c 5119961dfae740a8b7fd89c34988f9c583e8c759
@@ -384,7 +384,7 @@ static void send_start_oscar_session(Osc
g_free(signature);
/* Make the request */
- od->url_data = purple_util_fetch_url_request_len_with_account(account,
+ od->url_data = purple_util_fetch_url_request_len(account,
url, TRUE, NULL, FALSE, NULL, FALSE, -1,
start_oscar_session_cb, od);
g_free(url);
@@ -646,7 +646,7 @@ void send_client_login(OscarData *od, co
g_string_free(body, TRUE);
/* Send the POST request */
- od->url_data = purple_util_fetch_url_request_len_with_account(
+ od->url_data = purple_util_fetch_url_request_len(
purple_connection_get_account(gc), get_client_login_url(od),
TRUE, NULL, FALSE, request->str, FALSE, -1,
client_login_cb, od);
More information about the Commits
mailing list