mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 00:54:20 +02:00
Code Issues Releases Wiki Activity

Now that it's not just jabber that is autoconnected, don't ignore the

Browse Source 
option...
This commit is contained in:
Jeff Mitchell
2011-02-13 00:36:54 -05:00
parent ab9d79e21f
commit 312537fc8a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sip/SipHandler.cpp
View File

@@ -13,8 +13,8 @@
SipHandler::SipHandler( QObject* parent ) SipHandler::SipHandler( QObject* parent )
: QObject( parent ) : QObject( parent )
, m_connected( false )
{ {
m_connected = false;
loadPlugins( findPlugins() ); loadPlugins( findPlugins() );
} }

3
src/tomahawkapp.cpp
View File

@@ -418,7 +418,8 @@ TomahawkApp::setupSIP()
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
if( !arguments().contains( "--nosip" ) ) //FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings
if( !arguments().contains( "--nosip" ) && TomahawkSettings::instance()->jabberAutoConnect() )
{ {
m_xmppBot = new XMPPBot( this ); m_xmppBot = new XMPPBot( this );
qDebug() << "Connecting SIP classes"; qDebug() << "Connecting SIP classes";