mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-19 07:19:42 +01:00
Code Issues Releases Wiki Activity

Use system proxy when no proxy is set, for windows/mac

Browse Source
This commit is contained in:
Jeff Mitchell 2011-12-05 13:02:56 -05:00
parent e8563b119b
commit b80230c962
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libtomahawk/utils/tomahawkutils.cpp
View File

@ -309,24 +309,15 @@ NetworkProxyFactory::NetworkProxyFactory( const NetworkProxyFactory& other )
}
QList< QNetworkProxy >
NetworkProxyFactory::proxyForQuery( const QNetworkProxyQuery& query )
{
TomahawkUtils::NetworkProxyFactory* proxyFactory = TomahawkUtils::proxyFactory();
QList< QNetworkProxy > proxies = proxyFactory->queryProxy( query );
return proxies;
}
QList< QNetworkProxy >
NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query )
{
QList< QNetworkProxy > proxies;
QString hostname = query.peerHostName();
if ( m_proxy.hostName().isEmpty() || hostname.isEmpty() || m_noProxyHosts.contains( hostname ) || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy )
proxies << QNetworkProxy( QNetworkProxy::DefaultProxy ) << QNetworkProxy( QNetworkProxy::NoProxy );
proxies << systemProxyForQuery( query );
else
proxies << m_proxy << QNetworkProxy( QNetworkProxy::DefaultProxy ) << QNetworkProxy( QNetworkProxy::NoProxy );
proxies << m_proxy << systemProxyForQuery( query );
return proxies;
}

1
src/libtomahawk/utils/tomahawkutils.h
View File

@ -52,7 +52,6 @@ namespace TomahawkUtils
virtual ~NetworkProxyFactory() {}
virtual QList< QNetworkProxy > queryProxy( const QNetworkProxyQuery & query = QNetworkProxyQuery() );
static QList< QNetworkProxy > proxyForQuery( const QNetworkProxyQuery & query );
virtual void setNoProxyHosts( const QStringList &hosts );
virtual QStringList noProxyHosts() const { return m_noProxyHosts; }