From bb44c9a2e921f15a873bb148245d1d1ae90fe9f2 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 18 Jun 2012 16:18:44 -0400 Subject: [PATCH] Remove some debug and change around some proxy ordering to make sense when no hostname is passed in --- src/MusicScanner.cpp | 2 +- src/libtomahawk/utils/TomahawkUtils.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MusicScanner.cpp b/src/MusicScanner.cpp index f1b489878..44ca87452 100644 --- a/src/MusicScanner.cpp +++ b/src/MusicScanner.cpp @@ -287,7 +287,7 @@ MusicScanner::scanFile( const QFileInfo& fi ) m_filemtimes.remove( "file://" + fi.canonicalFilePath() ); } - tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Scanning file:" << fi.canonicalFilePath(); + //tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Scanning file:" << fi.canonicalFilePath(); QVariant m = readFile( fi ); if ( m.toMap().isEmpty() ) return; diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp index 83cfbf821..179308a52 100644 --- a/src/libtomahawk/utils/TomahawkUtils.cpp +++ b/src/libtomahawk/utils/TomahawkUtils.cpp @@ -333,14 +333,14 @@ NetworkProxyFactory::NetworkProxyFactory( const NetworkProxyFactory& other ) QList< QNetworkProxy > NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query ) { - //tDebug() << Q_FUNC_INFO << "query hostname is " << query.peerHostName(); + //tDebug() << Q_FUNC_INFO << "query hostname is " << query.peerHostName() << ", proxy host is " << m_proxy.hostName(); QList< QNetworkProxy > proxies; QString hostname = query.peerHostName(); s_noProxyHostsMutex.lock(); - if ( s_noProxyHosts.contains( hostname ) ) + if ( !hostname.isEmpty() && s_noProxyHosts.contains( hostname ) ) proxies << QNetworkProxy::NoProxy << systemProxyForQuery( query ); - else if ( m_proxy.hostName().isEmpty() || hostname.isEmpty() || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy ) + else if ( m_proxy.hostName().isEmpty() || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy ) proxies << systemProxyForQuery( query ); else proxies << m_proxy << systemProxyForQuery( query );