libpurple/protocols/yahoo/libymsg.c

changeset 32147
f16364a9c7fb
parent 32020
02bd1864619a
child 32157
39ba2e2492ee
equal deleted inserted replaced
32146:dc5ca87fcfa3 32147:f16364a9c7fb
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_with_account( 2017 url_data = purple_util_fetch_url_request_len(
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_with_account( 2058 url_data = purple_util_fetch_url_request_len(
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);
3706 3706
3707 yahoo_picture_check(account); 3707 yahoo_picture_check(account);
3708 3708
3709 /* Get the pager server. Actually start connecting in the callback since we 3709 /* Get the pager server. Actually start connecting in the callback since we
3710 * must have the contents of the HTTP response to proceed. */ 3710 * must have the contents of the HTTP response to proceed. */
3711 url_data = purple_util_fetch_url_request_len_with_account( 3711 url_data = purple_util_fetch_url_request_len(
3712 proxy_ssl ? purple_connection_get_account(gc) : NULL, 3712 proxy_ssl ? purple_connection_get_account(gc) : NULL,
3713 yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL, 3713 yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL,
3714 use_whole_url ? TRUE : FALSE, 3714 use_whole_url ? TRUE : FALSE,
3715 YAHOO_CLIENT_USERAGENT, FALSE, NULL, FALSE, -1, 3715 YAHOO_CLIENT_USERAGENT, FALSE, NULL, FALSE, -1,
3716 yahoo_got_pager_server, yd); 3716 yahoo_got_pager_server, yd);
4294 "Host: login.yahoo.com\r\n" 4294 "Host: login.yahoo.com\r\n"
4295 "Content-Length: 0\r\n\r\n", 4295 "Content-Length: 0\r\n\r\n",
4296 use_whole_url ? base_url : "", 4296 use_whole_url ? base_url : "",
4297 yd->cookie_t, yd->cookie_y); 4297 yd->cookie_t, yd->cookie_y);
4298 4298
4299 url_data = purple_util_fetch_url_request_len_with_account( 4299 url_data = purple_util_fetch_url_request_len(
4300 purple_connection_get_account(gc), base_url, use_whole_url, 4300 purple_connection_get_account(gc), base_url, use_whole_url,
4301 YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1, 4301 YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
4302 yahoo_get_inbox_token_cb, gc); 4302 yahoo_get_inbox_token_cb, gc);
4303 4303
4304 g_free(request); 4304 g_free(request);
4486 4486
4487 /* use whole URL if using HTTP Proxy */ 4487 /* use whole URL if using HTTP Proxy */
4488 if ((gc->account->proxy_info) && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP)) 4488 if ((gc->account->proxy_info) && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP))
4489 use_whole_url = TRUE; 4489 use_whole_url = TRUE;
4490 4490
4491 url_data = purple_util_fetch_url_request_len_with_account( 4491 url_data = purple_util_fetch_url_request_len(
4492 purple_connection_get_account(gc), YAHOO_SMS_CARRIER_URL, use_whole_url, 4492 purple_connection_get_account(gc), YAHOO_SMS_CARRIER_URL, use_whole_url,
4493 YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1, 4493 YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
4494 yahoo_get_sms_carrier_cb, data); 4494 yahoo_get_sms_carrier_cb, data);
4495 4495
4496 g_free(request); 4496 g_free(request);

mercurial