mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Cleanup from my previous fix

Browse Source
This commit is contained in:
Jeff Mitchell
2011-05-25 23:43:09 -04:00
parent e3e90744bf
commit f6756682f1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,6 @@
Version 0.1.0: Version 0.1.0:
* Initial SOCKS5 proxy support. * SOCKS5 proxy support. Noproxy hosts are also supported but no wildcard
support (yet).
* Fix issue where track resolving spinner never stopped if tracks were * Fix issue where track resolving spinner never stopped if tracks were
removed from playlist while resolving. removed from playlist while resolving.
* Twitter & Jabber profile pictures are shown. * Twitter & Jabber profile pictures are shown.

2
src/libtomahawk/sip/SipHandler.cpp
View File

@@ -389,7 +389,7 @@ SipHandler::connectPlugin( bool startup, const QString &pluginId )
if ( sip->pluginId() == pluginId ) if ( sip->pluginId() == pluginId )
{ {
Q_ASSERT( m_enabledPlugins.contains( sip ) ); // make sure the plugin we're connecting is enabled. should always be the case Q_ASSERT( m_enabledPlugins.contains( sip ) ); // make sure the plugin we're connecting is enabled. should always be the case
sip->refreshProxy(); //each sip should refreshProxy() or take care of that function in some other way during connection
sip->connectPlugin( startup ); sip->connectPlugin( startup );
} }
} }

2
src/sip/jabber/jabber.cpp
View File

@@ -532,8 +532,6 @@ JabberPlugin::checkSettings()
setupClientHelper(); setupClientHelper();
refreshProxy();
qDebug() << Q_FUNC_INFO << "Updated settings"; qDebug() << Q_FUNC_INFO << "Updated settings";
connectPlugin( false ); connectPlugin( false );
} }