pidgin/ljfisher-ssl-client-auth

Remove purple_util_fetch_url_request_len() and change the few places

2011-08-21, Mark Doliner
dc5ca87fcfa3
Parents 22222cee0d53
Children f16364a9c7fb
Remove purple_util_fetch_url_request_len() and change the few places
that used it to use purple_util_fetch_url_request_len_with_account()
4 files changed, 4 insertions(+), 38 deletions(-)
  • +2 -2
    libpurple/upnp.c
  • +0 -11
    libpurple/util.c
  • +1 -24
    libpurple/util.h
  • +1 -1
    pidgin/plugins/relnot.c
    • --- a/libpurple/upnp.c Sun Aug 21 01:35:54 2011 +0000
    +++ b/libpurple/upnp.c Sun Aug 21 01:52:25 2011 +0000
    @@ -464,7 +464,7 @@
    purple_timeout_remove(dd->tima);
    dd->tima = 0;
    - purple_util_fetch_url_request_len(descriptionURL, TRUE, NULL, TRUE, httpRequest,
    + purple_util_fetch_url_request_len_with_account(NULL, descriptionURL, TRUE, NULL, TRUE, httpRequest,
    TRUE, MAX_UPNP_DOWNLOAD, upnp_parse_description_cb, dd);
    g_free(httpRequest);
    @@ -730,7 +730,7 @@
    g_free(pathOfControl);
    g_free(soapMessage);
    - gfud = purple_util_fetch_url_request_len(control_info.control_url, FALSE, NULL, TRUE,
    + gfud = purple_util_fetch_url_request_len_with_account(NULL, control_info.control_url, FALSE, NULL, TRUE,
    totalSendMessage, TRUE, MAX_UPNP_DOWNLOAD, cb, cb_data);
    g_free(totalSendMessage);
    --- a/libpurple/util.c Sun Aug 21 01:35:54 2011 +0000
    +++ b/libpurple/util.c Sun Aug 21 01:52:25 2011 +0000
    @@ -4115,17 +4115,6 @@
    }
    PurpleUtilFetchUrlData *
    -purple_util_fetch_url_request_len(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)
    -{
    - return purple_util_fetch_url_request_len_with_account(NULL, url, full,
    - user_agent, http11, request, include_headers, max_len, callback,
    - user_data);
    -}
    -
    -PurpleUtilFetchUrlData *
    purple_util_fetch_url_request_len_with_account(PurpleAccount *account,
    const char *url, gboolean full, const char *user_agent, gboolean http11,
    const char *request, gboolean include_headers, gssize max_len,
    --- a/libpurple/util.h Sun Aug 21 01:35:54 2011 +0000
    +++ b/libpurple/util.h Sun Aug 21 01:52:25 2011 +0000
    @@ -1138,7 +1138,7 @@
    * @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(url, full, user_agent, http11, NULL, \
    + purple_util_fetch_url_request_len_with_account(NULL, url, full, user_agent, http11, NULL, \
    FALSE, max_len, cb, data);
    /**
    @@ -1164,28 +1164,6 @@
    /**
    * 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 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, this will go away.
    - */
    -PurpleUtilFetchUrlData *purple_util_fetch_url_request_len(const gchar *url,
    - gboolean full, const gchar *user_agent, gboolean http11,
    - const gchar *request, gboolean include_headers, gssize max_len,
    - 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
    @@ -1199,7 +1177,6 @@
    * @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_with_account(
    PurpleAccount *account, const gchar *url,
    --- a/pidgin/plugins/relnot.c Sun Aug 21 01:35:54 2011 +0000
    +++ b/pidgin/plugins/relnot.c Sun Aug 21 01:52:25 2011 +0000
    @@ -152,7 +152,7 @@
    url,
    host);
    - purple_util_fetch_url_request_len(url, TRUE, NULL, FALSE,
    + purple_util_fetch_url_request_len_with_account(NULL, url, TRUE, NULL, FALSE,
    request, TRUE, -1, version_fetch_cb, NULL);
    g_free(request);