pidgin: 85febe60: * purple_util_fetch_url_request_len() re...
andrew.victor at mxit.com
andrew.victor at mxit.com
Sat Sep 24 18:25:49 EDT 2011
----------------------------------------------------------------------
Revision: 85febe603f05a6d725951dba1418fb6ed6648136
Parent: 700f944d25882f64a5ce15e7d34382e66dfc4ee8
Author: andrew.victor at mxit.com
Date: 09/24/11 18:09:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/85febe603f05a6d725951dba1418fb6ed6648136
Changelog:
* purple_util_fetch_url_request_len() renamed to purple_util_fetch_url_request().
* purple_util_fetch_url_len() renamed to purple_util_fetch_url().
Changes against parent 700f944d25882f64a5ce15e7d34382e66dfc4ee8
patched ChangeLog.API
patched finch/plugins/gnttinyurl.c
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/jabber/google/relay.c
patched libpurple/protocols/jabber/useravatar.c
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/msn/slp.c
patched libpurple/protocols/mxit/formcmds.c
patched libpurple/protocols/mxit/login.c
patched libpurple/protocols/mxit/markup.c
patched libpurple/protocols/mxit/protocol.c
patched libpurple/protocols/myspace/user.c
patched libpurple/protocols/oscar/clientlogin.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/protocols/yahoo/yahoo_aliases.c
patched libpurple/protocols/yahoo/yahoo_picture.c
patched libpurple/protocols/yahoo/yahoo_profile.c
patched libpurple/upnp.c
patched libpurple/util.c
patched libpurple/util.h
patched pidgin/gtkprefs.c
patched pidgin/gtksmiley.c
patched pidgin/gtkstatusbox.c
patched pidgin/plugins/relnot.c
-------------- next part --------------
============================================================
--- libpurple/util.c 3daea11476e54c7dc25c389ae4cbc9038aa5ce02
+++ libpurple/util.c b213f27f7020d97ad81f89b4e72950d30d826153
@@ -4167,19 +4167,7 @@ PurpleUtilFetchUrlData *
}
PurpleUtilFetchUrlData *
-purple_util_fetch_url_request(const char *url, gboolean full,
- const char *user_agent, gboolean http11,
- const char *request, gboolean include_headers,
- PurpleUtilFetchUrlCallback callback, void *user_data)
-{
- 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(PurpleAccount *account,
+purple_util_fetch_url_request(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/msn/msn.c 6155ea3236393f04fb2845b78f6dc9ffbf6134f3
+++ libpurple/protocols/msn/msn.c 4c8d260f63db8db2759923d0506973c0ad9ea30c
@@ -2742,7 +2742,7 @@ msn_got_info(PurpleUtilFetchUrlData *url
/* Try to put the photo in there too, if there's one */
if (photo_url_text)
{
- url_data = purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE,
+ url_data = purple_util_fetch_url(photo_url_text, FALSE, NULL, FALSE,
MAX_HTTP_BUDDYICON_BYTES,
msn_got_photo, info2_data);
session->url_datas = g_slist_prepend(session->url_datas, url_data);
@@ -2841,7 +2841,7 @@ msn_get_info(PurpleConnection *gc, const
url_data = purple_util_fetch_url(url, FALSE,
"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
- TRUE, msn_got_info, data);
+ TRUE, -1, msn_got_info, data);
session->url_datas = g_slist_prepend(session->url_datas, url_data);
g_free(url);
============================================================
--- libpurple/protocols/gg/gg.c 38e3a3bcdbcd92597e51d68b036a664ab0f73be1
+++ libpurple/protocols/gg/gg.c be1f4ebe1e11e74cad0ed7e877fbf532b316ab0a
@@ -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(account,
+ url_data = purple_util_fetch_url_request(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(
+ url_data = purple_util_fetch_url_request(
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 dc1fad091353067e1fc0384795508a374a37b606
+++ libpurple/protocols/yahoo/libymsg.c 588aad1d805f34d6f4f36445870f08aa823dac23
@@ -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(
+ url_data = purple_util_fetch_url_request(
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(
+ url_data = purple_util_fetch_url_request(
proxy_ssl ? account : NULL, url, TRUE,
YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1,
yahoo_auth16_stage1_cb, auth_data);
@@ -2247,7 +2247,7 @@ static void yahoo_process_authresp(Purpl
if (gc->inpa)
purple_input_remove(gc->inpa);
url_data = purple_util_fetch_url(WEBMESSENGER_URL, TRUE,
- "Purple/" VERSION, FALSE, yahoo_login_page_cb, gc);
+ "Purple/" VERSION, FALSE, -1, yahoo_login_page_cb, gc);
if (url_data != NULL)
yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
return;
@@ -3709,7 +3709,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(
+ url_data = purple_util_fetch_url_request(
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,
@@ -4287,7 +4287,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(
+ url_data = purple_util_fetch_url_request(
purple_connection_get_account(gc), base_url, use_whole_url,
YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
yahoo_get_inbox_token_cb, gc);
@@ -4479,7 +4479,7 @@ static void yahoo_get_sms_carrier(Purple
if ((gc->account->proxy_info) && (purple_proxy_info_get_type(gc->account->proxy_info) == PURPLE_PROXY_HTTP))
use_whole_url = TRUE;
- url_data = purple_util_fetch_url_request_len(
+ url_data = purple_util_fetch_url_request(
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 a2c70e76854a542dd7e908277d7699b78f14e17c
+++ libpurple/util.h ae5fdd155724a677c08280b296349a11faf273a6
@@ -1167,53 +1167,17 @@ typedef void (*PurpleUtilFetchUrlCallbac
* partial URL.
* @param user_agent The user agent field to use, or NULL.
* @param http11 TRUE if HTTP/1.1 should be used to download the file.
- * @param cb The callback function.
- * @param data The user data to pass to the callback function.
- */
-#define purple_util_fetch_url(url, full, user_agent, http11, cb, data) \
- purple_util_fetch_url_request(url, full, user_agent, http11, NULL, \
- FALSE, cb, data);
-
-/**
- * Fetches the data from a URL, and passes it to a callback function.
- *
- * @param url The URL.
- * @param full TRUE if this is the full URL, or FALSE if it's a
- * partial URL.
- * @param user_agent The user agent field to use, or NULL.
- * @param http11 TRUE if HTTP/1.1 should be used to download the file.
* @param max_len The maximum number of bytes to retrieve (-1 for unlimited)
* @param cb The callback function.
* @param data The user data to pass to the callback function.
- * @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(NULL, url, full, user_agent, http11, NULL, \
+#define purple_util_fetch_url(url, full, user_agent, http11, max_len, cb, data) \
+ purple_util_fetch_url_request(NULL, url, full, user_agent, http11, NULL, \
FALSE, max_len, cb, data);
/**
* Fetches the data from a URL, and passes it to a callback function.
*
- * @param url The URL.
- * @param full TRUE if this is the full URL, or FALSE if it's a
- * partial URL.
- * @param user_agent The user agent field to use, or NULL.
- * @param http11 TRUE if HTTP/1.1 should be used to download the file.
- * @param request A HTTP request to send to the server instead of the
- * standard GET
- * @param include_headers
- * If TRUE, include the HTTP headers in the response.
- * @param callback The callback function.
- * @param data The user data to pass to the callback function.
- */
-PurpleUtilFetchUrlData *purple_util_fetch_url_request(const gchar *url,
- gboolean full, const gchar *user_agent, gboolean http11,
- const gchar *request, gboolean include_headers,
- PurpleUtilFetchUrlCallback callback, gpointer data);
-
-/**
- * Fetches the data from a URL, and passes it to a callback function.
- *
* @param account The account for which the request is needed, or NULL.
* @param url The URL.
* @param full TRUE if this is the full URL, or FALSE if it's a
@@ -1227,9 +1191,8 @@ PurpleUtilFetchUrlData *purple_util_fetc
* @param max_len The maximum number of bytes to retrieve (-1 for unlimited)
* @param callback The callback function.
* @param data The user data to pass to the callback function.
- * @deprecated In 3.0.0, we'll rename this to "purple_util_fetch_url_request" and get rid of the old one
*/
-PurpleUtilFetchUrlData *purple_util_fetch_url_request_len(
+PurpleUtilFetchUrlData *purple_util_fetch_url_request(
PurpleAccount *account, const gchar *url,
gboolean full, const gchar *user_agent, gboolean http11,
const gchar *request, gboolean include_headers, gssize max_len,
============================================================
--- pidgin/gtkprefs.c 43c82875dc26637afea56c11ac4228b3c0c5ad3c
+++ pidgin/gtkprefs.c 9d7a4a762fc0670fdf5a94196c03ba53750b2cf7
@@ -891,7 +891,7 @@ theme_dnd_recv(GtkWidget *widget, GdkDra
} else if (!g_ascii_strncasecmp(name, "http://", 7)) {
/* Oo, a web drag and drop. This is where things
* will start to get interesting */
- purple_util_fetch_url(name, TRUE, NULL, FALSE, theme_got_url, info);
+ purple_util_fetch_url(name, TRUE, NULL, FALSE, -1, theme_got_url, info);
} else if (!g_ascii_strncasecmp(name, "https://", 8)) {
/* purple_util_fetch_url() doesn't support HTTPS, but we want users
* to be able to drag and drop links from the SF trackers, so
@@ -902,7 +902,7 @@ theme_dnd_recv(GtkWidget *widget, GdkDra
tmp[2] = 't';
tmp[3] = 'p';
- purple_util_fetch_url(tmp, TRUE, NULL, FALSE, theme_got_url, info);
+ purple_util_fetch_url(tmp, TRUE, NULL, FALSE, -1, theme_got_url, info);
g_free(tmp);
} else
free_theme_info(info);
============================================================
--- pidgin/plugins/relnot.c 30675a6b92b8487e3947b1cfe7b4c63bfc54e2a8
+++ pidgin/plugins/relnot.c f216199b90052352208721f75a6d981131829853
@@ -152,7 +152,7 @@ do_check(void)
url,
host);
- purple_util_fetch_url_request_len(NULL, url, TRUE, NULL, FALSE,
+ purple_util_fetch_url_request(NULL, url, TRUE, NULL, FALSE,
request, TRUE, -1, version_fetch_cb, NULL);
g_free(request);
============================================================
--- ChangeLog.API 2604cbeb7211598f51399ce0d9a59d6b099fa28f
+++ ChangeLog.API c3257567063ffc7e60692bfd6b274a762825da5e
@@ -53,10 +53,15 @@ version 3.0.0 (??/??/????):
* xmlnode_strip_prefixes
Changed:
+ * purple_account_add_buddy now takes an invite message as the last
+ parameter
+ * purple_account_add_buddies now takes an invite message as the last
+ parameter
* purple_certificate_check_signature_chain_with_failing renamed
to purple_certificate_check_signature_chain
* purple_connection_error now takes a PurpleConnectionError
as the second parameter
+ * purple_dnsquery_a now takes a PurpleAccount as the first parameter
* purple_network_listen_family renamed to purple_network_listen
* purple_network_listen_range_family renamed to
purple_network_listen_range
@@ -66,17 +71,14 @@ version 3.0.0 (??/??/????):
a GList
* purple_notify_user_info_prepend_pair renamed to
purple_notify_user_info_prepend_pair_html
+ * purple_srv_resolve now takes a PurpleAccount as the first parameter
+ * purple_txt_resolve now takes a PurpleAccount as the first parameter
* purple_util_fetch_url_request_len now takes a PurpleAccount as
the first parameter
+ * purple_util_fetch_url_request_len renamed to purple_util_fetch_url_request
+ * purple_util_fetch_url_len renamed to purple_util_fetch_url
* PurpleConnectionUiOps.report_disconnect now passes a
PurpleConnectionError as the second parameter
- * purple_dnsquery_a now takes a PurpleAccount as the first parameter
- * purple_srv_resolve now takes a PurpleAccount as the first parameter
- * purple_txt_resolve now takes a PurpleAccount as the first parameter
- * purple_account_add_buddy now takes an invite message as the last
- parameter
- * purple_account_add_buddies now takes an invite message as the last
- parameter
Removed:
* _GntFileType
============================================================
--- libpurple/protocols/yahoo/yahoo_profile.c d6982b7d8cbb97e927c924be84bf7e3eb9f228b2
+++ libpurple/protocols/yahoo/yahoo_profile.c 571edbc65ccd76c72a79929aeed698d3f7e9f7b3
@@ -940,7 +940,7 @@ static void yahoo_got_info(PurpleUtilFet
* we specify HTTP 1.1. So we have to specify 1.0 & fix purple_util_fetch_url
*/
url_data = purple_util_fetch_url(photo_url_text, use_whole_url, NULL,
- FALSE, yahoo_got_photo, info2_data);
+ FALSE, -1, yahoo_got_photo, info2_data);
if (url_data != NULL)
yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
} else {
@@ -1274,7 +1274,7 @@ void yahoo_get_info(PurpleConnection *gc
url = g_strdup_printf("%s%s",
(yd->jp ? YAHOOJP_PROFILE_URL : YAHOO_PROFILE_URL), name);
- url_data = purple_util_fetch_url(url, TRUE, NULL, FALSE, yahoo_got_info, data);
+ url_data = purple_util_fetch_url(url, TRUE, NULL, FALSE, -1, yahoo_got_info, data);
if (url_data != NULL)
yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
else {
============================================================
--- libpurple/protocols/msn/slp.c 926f0935ab765c18c94c14a35c903c0eec24fd30
+++ libpurple/protocols/msn/slp.c 73429be67fba1fa283d9a02dfc56f4a4331ee135
@@ -253,7 +253,7 @@ msn_request_user_display(MsnUser *user)
data->session = session;
data->remote_user = user->passport;
data->sha1 = info;
- url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE, 200*1024,
+ url_data = purple_util_fetch_url(url, TRUE, NULL, TRUE, 200*1024,
fetched_user_display, data);
session->url_datas = g_slist_prepend(session->url_datas, url_data);
} else {
============================================================
--- libpurple/protocols/yahoo/yahoo_picture.c c11d6b74614789a4cde12a8380ffeb1897ddedb6
+++ libpurple/protocols/yahoo/yahoo_picture.c 61e630b731cb279b56189fac6ef62aeb4068ba2e
@@ -132,7 +132,7 @@ void yahoo_process_picture(PurpleConnect
data->checksum = checksum;
/* TODO: Does this need to be MSIE 5.0? */
url_data = purple_util_fetch_url(url, use_whole_url,
- "Mozilla/4.0 (compatible; MSIE 5.5)", FALSE,
+ "Mozilla/4.0 (compatible; MSIE 5.5)", FALSE, -1,
yahoo_fetch_picture_cb, data);
if (url_data != NULL) {
yd = purple_connection_get_protocol_data(gc);
============================================================
--- pidgin/gtkstatusbox.c fcf329296a14acb9aa85d435f345980deb121d73
+++ pidgin/gtkstatusbox.c f21ab86002a651a8470d90daf156bfa1e5f9acb9
@@ -412,7 +412,7 @@ statusbox_uri_handler(const char *proto,
if (src == NULL)
return FALSE;
- purple_util_fetch_url(src, TRUE, NULL, FALSE, statusbox_got_url, data);
+ purple_util_fetch_url(src, TRUE, NULL, FALSE, -1, statusbox_got_url, data);
return TRUE;
}
============================================================
--- libpurple/upnp.c f9a9b04bf11b70f3c05d402c95dd91087242fe1b
+++ libpurple/upnp.c 662d56d2b1e549d039c1414f8ab4fca00f08507f
@@ -464,7 +464,7 @@ purple_upnp_parse_description(const gcha
purple_timeout_remove(dd->tima);
dd->tima = 0;
- purple_util_fetch_url_request_len(NULL, descriptionURL, TRUE, NULL, TRUE, httpRequest,
+ purple_util_fetch_url_request(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(NULL, control_info.control_url, FALSE, NULL, TRUE,
+ gfud = purple_util_fetch_url_request(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 9d5f453e385f3abec2e675acbcc48015945b5db9
+++ libpurple/protocols/yahoo/yahoo_aliases.c d713171455673e9fcb72a713ef03e98eb7f7c8f1
@@ -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(purple_connection_get_account(gc),
+ url_data = purple_util_fetch_url_request(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(
+ url_data = purple_util_fetch_url_request(
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(account, webaddress, FALSE,
+ url_data = purple_util_fetch_url_request(account, webaddress, FALSE,
YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
yahoo_fetch_aliases_cb, gc);
if (url_data != NULL)
============================================================
--- libpurple/protocols/myspace/user.c 2d27ea382026271d4c6eb3ba69be63f7c425bc19
+++ libpurple/protocols/myspace/user.c e8100e06127c6137a749a7df4bfea7e5bc8cb7fa
@@ -384,7 +384,7 @@ msim_store_user_info_each(const gchar *k
if (!previous_url || !g_str_equal(previous_url, user->image_url)) {
if (user->url_data != NULL)
purple_util_fetch_url_cancel(user->url_data);
- user->url_data = purple_util_fetch_url(user->image_url, TRUE, NULL, TRUE, msim_downloaded_buddy_icon, (gpointer)user);
+ user->url_data = purple_util_fetch_url(user->image_url, TRUE, NULL, TRUE, -1, msim_downloaded_buddy_icon, (gpointer)user);
}
} else if (g_str_equal(key_str, "LastImageUpdated")) {
/* TODO: use somewhere */
============================================================
--- pidgin/gtksmiley.c 4f3b709d3423b5230eb2b738a9da8c858a10b79f
+++ pidgin/gtksmiley.c 3abe4ba004fe89d76b6d8177f72047f8c6d0da25
@@ -750,7 +750,7 @@ smiley_dnd_recv(GtkWidget *widget, GdkDr
} else if (!g_ascii_strncasecmp(name, "http://", 7)) {
/* Oo, a web drag and drop. This is where things
* will start to get interesting */
- purple_util_fetch_url(name, TRUE, NULL, FALSE, smiley_got_url, dialog);
+ purple_util_fetch_url(name, TRUE, NULL, FALSE, -1, smiley_got_url, dialog);
} else if (!g_ascii_strncasecmp(name, "https://", 8)) {
/* purple_util_fetch_url() doesn't support HTTPS */
char *tmp = g_strdup(name + 1);
@@ -759,7 +759,7 @@ smiley_dnd_recv(GtkWidget *widget, GdkDr
tmp[2] = 't';
tmp[3] = 'p';
- purple_util_fetch_url(tmp, TRUE, NULL, FALSE, smiley_got_url, dialog);
+ purple_util_fetch_url(tmp, TRUE, NULL, FALSE, -1, smiley_got_url, dialog);
g_free(tmp);
}
============================================================
--- libpurple/protocols/jabber/useravatar.c db821f64b1414bd537a55ecb8b7e95c71bccd653
+++ libpurple/protocols/jabber/useravatar.c 398da00de2888194e652302f184efc621e2aeb11
@@ -377,7 +377,7 @@ update_buddy_metadata(JabberStream *js,
JabberBuddyAvatarUpdateURLInfo *info = g_new0(JabberBuddyAvatarUpdateURLInfo, 1);
info->js = js;
- url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE,
+ url_data = purple_util_fetch_url(url, TRUE, NULL, TRUE,
MAX_HTTP_BUDDYICON_BYTES,
do_buddy_avatar_update_fromurl, info);
if (url_data) {
============================================================
--- finch/plugins/gnttinyurl.c 762feefac28f88d3e69dd9f37be2fb441e8705b9
+++ finch/plugins/gnttinyurl.c 192c27939715983b721d2940c0a318635819383b
@@ -319,7 +319,7 @@ process_urls(PurpleConversation *conv, G
url = g_strdup_printf("%s%s", purple_prefs_get_string(PREF_URL), purple_url_encode(tmp));
}
g_free(tmp);
- purple_util_fetch_url(url, TRUE, "finch", FALSE, url_fetched, cbdata);
+ purple_util_fetch_url(url, TRUE, "finch", FALSE, -1, url_fetched, cbdata);
i = gnt_text_view_get_lines_below(tv);
str = g_strdup_printf(_("\nFetching TinyURL..."));
gnt_text_view_append_text_with_tag((tv), str, GNT_TEXT_FLAG_DIM, cbdata->tag);
@@ -383,7 +383,7 @@ tinyurl_notify_uri(const char *uri)
/* Store the return value of _fetch_url and destroy that when win is
destroyed, so that the callback for _fetch_url does not try to molest a
non-existent window */
- urlcb = purple_util_fetch_url(fullurl, TRUE, "finch", FALSE, tinyurl_notify_fetch_cb, win);
+ urlcb = purple_util_fetch_url(fullurl, TRUE, "finch", FALSE, -1, tinyurl_notify_fetch_cb, win);
g_free(fullurl);
g_signal_connect_swapped(G_OBJECT(win), "destroy",
G_CALLBACK(purple_util_fetch_url_cancel), urlcb);
============================================================
--- libpurple/protocols/oscar/clientlogin.c 5cabbddca7acb2acf40e5d11b4d1a5858489c414
+++ libpurple/protocols/oscar/clientlogin.c d88d9cd7dc6bbc07f337e5a4fb727fb95284a258
@@ -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(account,
+ od->url_data = purple_util_fetch_url_request(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(
+ od->url_data = purple_util_fetch_url_request(
purple_connection_get_account(gc), get_client_login_url(od),
TRUE, NULL, FALSE, request->str, FALSE, -1,
client_login_cb, od);
============================================================
--- libpurple/protocols/mxit/formcmds.c 6e9d7b11144ceada9a2812cb1e3adb4e004bdc57
+++ libpurple/protocols/mxit/formcmds.c 34766ebca66c73e40a231735d0c79154ccc2a286
@@ -362,7 +362,7 @@ static void command_image(struct RXMsgDa
purple_debug_info(MXIT_PLUGIN_ID, "sending request for inline image '%s'\n", iireq->url);
/* request the image (reference: "libpurple/util.h") */
- purple_util_fetch_url_request(iireq->url, TRUE, NULL, TRUE, NULL, FALSE, mxit_cb_ii_returned, iireq);
+ purple_util_fetch_url(iireq->url, TRUE, NULL, TRUE, -1, mxit_cb_ii_returned, iireq);
mx->img_count++;
}
}
============================================================
--- libpurple/protocols/mxit/login.c aedb9db7025e329d8ef96f4b2965f5d6e4450c0f
+++ libpurple/protocols/mxit/login.c 61047478f2053cfd3dae6ede35c725d8b89e5813
@@ -549,7 +549,7 @@ static void mxit_cb_captcha_ok( PurpleCo
session->logindata->wapserver, session->logindata->sessionid, purple_url_encode( session->acc->username ), PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_MICRO_VERSION, MXIT_CLIENT_ID, MXIT_CP_ARCH,
captcha_resp, session->logindata->cc, session->logindata->locale, ( state == MXIT_STATE_REGISTER1 ) ? 0 : 1, MXIT_CP_PLATFORM, MXIT_CP_OS,
MXIT_CAPTCHA_HEIGHT, MXIT_CAPTCHA_WIDTH, time( NULL ) );
- url_data = purple_util_fetch_url_request( url, TRUE, MXIT_HTTP_USERAGENT, TRUE, NULL, FALSE, mxit_cb_clientinfo2, session );
+ url_data = purple_util_fetch_url_request( session->acc, url, TRUE, MXIT_HTTP_USERAGENT, TRUE, NULL, FALSE, -1, mxit_cb_clientinfo2, session );
#ifdef DEBUG_PROTOCOL
purple_debug_info( MXIT_PLUGIN_ID, "HTTP REQUEST: '%s'\n", url );
@@ -713,7 +713,7 @@ static void get_clientinfo( struct MXitS
/* reference: "libpurple/util.h" */
url = g_strdup_printf( "%s/res/?type=challenge&getcountries=true&getlanguage=true&getimage=true&h=%i&w=%i&ts=%li", wapserver, MXIT_CAPTCHA_HEIGHT, MXIT_CAPTCHA_WIDTH, time( NULL ) );
- url_data = purple_util_fetch_url_request( url, TRUE, MXIT_HTTP_USERAGENT, TRUE, NULL, FALSE, mxit_cb_clientinfo1, session );
+ url_data = purple_util_fetch_url_request( session->acc, url, TRUE, MXIT_HTTP_USERAGENT, TRUE, NULL, FALSE, -1, mxit_cb_clientinfo1, session );
#ifdef DEBUG_PROTOCOL
purple_debug_info( MXIT_PLUGIN_ID, "HTTP REQUEST: '%s'\n", url );
============================================================
--- libpurple/protocols/mxit/markup.c 645b4601bfae8c09b0028bc145e940d6ab7905a9
+++ libpurple/protocols/mxit/markup.c 230c0bca83bdafd133b9f8584f43fad4590725c5
@@ -628,7 +628,7 @@ static void emoticon_request( struct RXM
/* reference: "libpurple/util.h" */
url = g_strdup_printf( "%s/res/?type=emo&mlh=%i&sc=%s&ts=%li", wapserver, MXIT_EMOTICON_SIZE, id, time( NULL ) );
- url_data = purple_util_fetch_url_request( url, TRUE, NULL, TRUE, NULL, FALSE, emoticon_returned, mx );
+ url_data = purple_util_fetch_url( url, TRUE, NULL, TRUE, -1, emoticon_returned, mx );
g_free( url );
}
============================================================
--- libpurple/protocols/mxit/protocol.c 90e530215e393debbf20f654992fb89879108691
+++ libpurple/protocols/mxit/protocol.c 4e4941fb7522eacaebfd6dbca67f7705c9b2e708
@@ -311,7 +311,7 @@ static void mxit_write_http_get( struct
#endif
/* send the HTTP request */
- session->http_out_req = purple_util_fetch_url_request( url, TRUE, MXIT_HTTP_USERAGENT, TRUE, NULL, FALSE, mxit_cb_http_rx, session );
+ session->http_out_req = purple_util_fetch_url_request( session->acc, url, TRUE, MXIT_HTTP_USERAGENT, TRUE, NULL, FALSE, -1, mxit_cb_http_rx, session );
g_free( url );
if ( part )
============================================================
--- libpurple/protocols/jabber/google/relay.c 482f69f1a3ab5051c1a053f392fa1f111d0079c1
+++ libpurple/protocols/jabber/google/relay.c 338b506d34ddd2763a38afc777f559ddf1e5fc07
@@ -137,7 +137,7 @@ jabber_google_do_relay_request(JabberStr
purple_debug_info("jabber",
"sending Google relay request %s to %s\n", request, url);
url_data =
- purple_util_fetch_url_request(url, FALSE, NULL, FALSE, request, FALSE,
+ purple_util_fetch_url_request(NULL, url, FALSE, NULL, FALSE, request, FALSE, -1,
jabber_google_relay_fetch_cb, data);
if (url_data) {
js->google_relay_requests =
More information about the Commits
mailing list