Mercurial > pidgin.yaz
comparison libpurple/protocols/yahoo/libymsg.c @ 32679:904686722499
* purple_util_fetch_url_request_len() renamed to purple_util_fetch_url_request().
* purple_util_fetch_url_len() renamed to purple_util_fetch_url().
author | andrew.victor@mxit.com |
---|---|
date | Sat, 24 Sep 2011 22:09:40 +0000 |
parents | d2ef8926b960 |
children | 0f94ec89f0bc 1f68af4afe67 |
comparison
equal
deleted
inserted
replaced
32678:348a933fed78 | 32679:904686722499 |
---|---|
2012 char *url = NULL; | 2012 char *url = NULL; |
2013 gboolean yahoojp = yahoo_is_japan(account); | 2013 gboolean yahoojp = yahoo_is_japan(account); |
2014 gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE); | 2014 gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE); |
2015 | 2015 |
2016 url = g_strdup_printf(yahoojp ? YAHOOJP_LOGIN_URL : YAHOO_LOGIN_URL, token); | 2016 url = g_strdup_printf(yahoojp ? YAHOOJP_LOGIN_URL : YAHOO_LOGIN_URL, token); |
2017 url_data = purple_util_fetch_url_request_len( | 2017 url_data = purple_util_fetch_url_request( |
2018 proxy_ssl ? account : NULL, url, TRUE, YAHOO_CLIENT_USERAGENT, | 2018 proxy_ssl ? account : NULL, url, TRUE, YAHOO_CLIENT_USERAGENT, |
2019 TRUE, NULL, TRUE, -1, yahoo_auth16_stage2, auth_data); | 2019 TRUE, NULL, TRUE, -1, yahoo_auth16_stage2, auth_data); |
2020 if (url_data) | 2020 if (url_data) |
2021 yd->url_datas = g_slist_prepend(yd->url_datas, url_data); | 2021 yd->url_datas = g_slist_prepend(yd->url_datas, url_data); |
2022 g_free(url); | 2022 g_free(url); |
2053 url = g_strdup_printf(yahoojp ? YAHOOJP_TOKEN_URL : YAHOO_TOKEN_URL, | 2053 url = g_strdup_printf(yahoojp ? YAHOOJP_TOKEN_URL : YAHOO_TOKEN_URL, |
2054 encoded_username, encoded_password, purple_url_encode(seed)); | 2054 encoded_username, encoded_password, purple_url_encode(seed)); |
2055 g_free(encoded_password); | 2055 g_free(encoded_password); |
2056 g_free(encoded_username); | 2056 g_free(encoded_username); |
2057 | 2057 |
2058 url_data = purple_util_fetch_url_request_len( | 2058 url_data = purple_util_fetch_url_request( |
2059 proxy_ssl ? account : NULL, url, TRUE, | 2059 proxy_ssl ? account : NULL, url, TRUE, |
2060 YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1, | 2060 YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1, |
2061 yahoo_auth16_stage1_cb, auth_data); | 2061 yahoo_auth16_stage1_cb, auth_data); |
2062 if (url_data) | 2062 if (url_data) |
2063 yd->url_datas = g_slist_prepend(yd->url_datas, url_data); | 2063 yd->url_datas = g_slist_prepend(yd->url_datas, url_data); |
2245 if (yd->fd >= 0) | 2245 if (yd->fd >= 0) |
2246 close(yd->fd); | 2246 close(yd->fd); |
2247 if (gc->inpa) | 2247 if (gc->inpa) |
2248 purple_input_remove(gc->inpa); | 2248 purple_input_remove(gc->inpa); |
2249 url_data = purple_util_fetch_url(WEBMESSENGER_URL, TRUE, | 2249 url_data = purple_util_fetch_url(WEBMESSENGER_URL, TRUE, |
2250 "Purple/" VERSION, FALSE, yahoo_login_page_cb, gc); | 2250 "Purple/" VERSION, FALSE, -1, yahoo_login_page_cb, gc); |
2251 if (url_data != NULL) | 2251 if (url_data != NULL) |
2252 yd->url_datas = g_slist_prepend(yd->url_datas, url_data); | 2252 yd->url_datas = g_slist_prepend(yd->url_datas, url_data); |
2253 return; | 2253 return; |
2254 } | 2254 } |
2255 #endif /* TRY_WEBMESSENGER_LOGIN */ | 2255 #endif /* TRY_WEBMESSENGER_LOGIN */ |
3707 | 3707 |
3708 yahoo_picture_check(account); | 3708 yahoo_picture_check(account); |
3709 | 3709 |
3710 /* Get the pager server. Actually start connecting in the callback since we | 3710 /* Get the pager server. Actually start connecting in the callback since we |
3711 * must have the contents of the HTTP response to proceed. */ | 3711 * must have the contents of the HTTP response to proceed. */ |
3712 url_data = purple_util_fetch_url_request_len( | 3712 url_data = purple_util_fetch_url_request( |
3713 proxy_ssl ? purple_connection_get_account(gc) : NULL, | 3713 proxy_ssl ? purple_connection_get_account(gc) : NULL, |
3714 yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL, | 3714 yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL, |
3715 use_whole_url ? TRUE : FALSE, | 3715 use_whole_url ? TRUE : FALSE, |
3716 YAHOO_CLIENT_USERAGENT, FALSE, NULL, FALSE, -1, | 3716 YAHOO_CLIENT_USERAGENT, FALSE, NULL, FALSE, -1, |
3717 yahoo_got_pager_server, yd); | 3717 yahoo_got_pager_server, yd); |
4285 "Host: login.yahoo.com\r\n" | 4285 "Host: login.yahoo.com\r\n" |
4286 "Content-Length: 0\r\n\r\n", | 4286 "Content-Length: 0\r\n\r\n", |
4287 use_whole_url ? base_url : "", | 4287 use_whole_url ? base_url : "", |
4288 yd->cookie_t, yd->cookie_y); | 4288 yd->cookie_t, yd->cookie_y); |
4289 | 4289 |
4290 url_data = purple_util_fetch_url_request_len( | 4290 url_data = purple_util_fetch_url_request( |
4291 purple_connection_get_account(gc), base_url, use_whole_url, | 4291 purple_connection_get_account(gc), base_url, use_whole_url, |
4292 YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1, | 4292 YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1, |
4293 yahoo_get_inbox_token_cb, gc); | 4293 yahoo_get_inbox_token_cb, gc); |
4294 | 4294 |
4295 g_free(request); | 4295 g_free(request); |
4477 | 4477 |
4478 /* use whole URL if using HTTP Proxy */ | 4478 /* use whole URL if using HTTP Proxy */ |
4479 if ((gc->account->proxy_info) && (purple_proxy_info_get_type(gc->account->proxy_info) == PURPLE_PROXY_HTTP)) | 4479 if ((gc->account->proxy_info) && (purple_proxy_info_get_type(gc->account->proxy_info) == PURPLE_PROXY_HTTP)) |
4480 use_whole_url = TRUE; | 4480 use_whole_url = TRUE; |
4481 | 4481 |
4482 url_data = purple_util_fetch_url_request_len( | 4482 url_data = purple_util_fetch_url_request( |
4483 purple_connection_get_account(gc), YAHOO_SMS_CARRIER_URL, use_whole_url, | 4483 purple_connection_get_account(gc), YAHOO_SMS_CARRIER_URL, use_whole_url, |
4484 YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1, | 4484 YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1, |
4485 yahoo_get_sms_carrier_cb, data); | 4485 yahoo_get_sms_carrier_cb, data); |
4486 | 4486 |
4487 g_free(request); | 4487 g_free(request); |