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

More explicitly set DefaultProxy and NoProxy in respective cases, may

Browse Source 
help jayniz
This commit is contained in:
Jeff Mitchell 2011-11-22 12:54:14 -05:00
parent 31a67ecd42
commit ef575c4d6d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,10 +324,10 @@ NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query )
tDebug() << Q_FUNC_INFO << "query.peerHostName() = " << query.peerHostName() << ", m_noProxyHosts = " << m_noProxyHosts;
QList< QNetworkProxy > proxies;
QString hostname = query.peerHostName();
if ( hostname.isEmpty() || m_noProxyHosts.contains( hostname ) )
proxies << QNetworkProxy( QNetworkProxy::NoProxy );
if ( m_proxy.hostName().isEmpty() || hostname.isEmpty() || m_noProxyHosts.contains( hostname ) || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy )
proxies << QNetworkProxy( QNetworkProxy::DefaultProxy ) << QNetworkProxy( QNetworkProxy::NoProxy );
else
proxies << m_proxy << QNetworkProxy( QNetworkProxy::NoProxy ) << QNetworkProxy( QNetworkProxy::DefaultProxy );
proxies << m_proxy << QNetworkProxy( QNetworkProxy::DefaultProxy ) << QNetworkProxy( QNetworkProxy::NoProxy );
tDebug() << Q_FUNC_INFO << " proxies size = " << proxies.size();
return proxies;
@ -497,10 +497,10 @@ setNam( QNetworkAccessManager* nam, bool noMutexLocker )
proxyFactory->setProxy( proxy );
//FIXME: Jreen is broke without this
QNetworkProxy::setApplicationProxy( proxy );
if ( !s->proxyNoProxyHosts().isEmpty() )
proxyFactory->setNoProxyHosts( s->proxyNoProxyHosts().split( ',', QString::SkipEmptyParts ) );
}
if ( !s->proxyNoProxyHosts().isEmpty() )
proxyFactory->setNoProxyHosts( s->proxyNoProxyHosts().split( ',', QString::SkipEmptyParts ) );
nam->setProxyFactory( proxyFactory );
s_threadNamHash[ QThread::currentThread() ] = nam;
s_threadProxyFactoryHash[ QThread::currentThread() ] = proxyFactory;