Mercurial > pidgin
diff libpurple/protocols/yahoo/yahoo.c @ 22330:d4998f31bc1a
merge of '4bc84ea5ca10129cd5e46b2f0f8f8e6b6a9146b3'
and 'c1feccb59fff57f000efd2b3f63ad2b5029bfc97'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sun, 24 Feb 2008 18:21:02 +0000 |
| parents | cc5b2a145652 b0ed2ce8514d |
| children | 0c098ebe9f16 |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo.c Sun Feb 24 01:47:42 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Sun Feb 24 18:21:02 2008 +0000 @@ -3509,8 +3509,13 @@ "Host: login.yahoo.com\r\n" "Content-Length: 0\r\n\r\n", yd->cookie_t, yd->cookie_y); - - url_data = purple_util_fetch_url_request(base_url, FALSE, + gboolean use_whole_url = FALSE; + + /* use whole URL if using HTTP Proxy */ + if ((gc->account->proxy_info) && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP)) + use_whole_url = TRUE; + + url_data = purple_util_fetch_url_request(base_url, use_whole_url, "Mozilla/4.0 (compatible; MSIE 5.5)", TRUE, request, FALSE, yahoo_get_inbox_token_cb, gc);