Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix network access on linux without a proxy

Browse Source
This commit is contained in:
David Sansome 2010-12-26 12:03:10 +00:00
parent e6561a0122
commit b5942aa7d6
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/networkproxyfactory.cpp
View File

@ -11,7 +11,7 @@ const char* NetworkProxyFactory::kSettingsGroup = "Proxy";
NetworkProxyFactory::NetworkProxyFactory()
: mode_(Mode_System),
type_(QNetworkProxy::HttpProxy),
type_(QNetworkProxy::HttpProxy),
port_(8080),
use_authentication_(false)
{
@ -71,14 +71,18 @@ QList<QNetworkProxy> NetworkProxyFactory::queryProxy(
#ifdef Q_OS_LINUX
Q_UNUSED(query);
ret.setHostName(env_url_.host());
ret.setPort(env_url_.port());
ret.setUser(env_url_.userName());
ret.setPassword(env_url_.password());
if (env_url_.scheme().startsWith("http"))
ret.setType(QNetworkProxy::HttpProxy);
else
ret.setType(QNetworkProxy::Socks5Proxy);
if (env_url_.isEmpty()) {
ret.setType(QNetworkProxy::NoProxy);
} else {
ret.setHostName(env_url_.host());
ret.setPort(env_url_.port());
ret.setUser(env_url_.userName());
ret.setPassword(env_url_.password());
if (env_url_.scheme().startsWith("http"))
ret.setType(QNetworkProxy::HttpProxy);
else
ret.setType(QNetworkProxy::Socks5Proxy);
}
break;
#else
return systemProxyForQuery(query);