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

Merge branch 'master' into tweetsip

Browse Source
This commit is contained in:
Jeff Mitchell 2011-02-11 18:03:48 -05:00
commit 3144ae76cf
1 changed files with 5 additions and 0 deletions

5
src/sip/jabber/jabber_p.cpp

@ -150,11 +150,16 @@ Jabber_p::go()
// Handle proxy
qDebug() << "Connecting to the XMPP server...";
//FIXME: This call blocks and locks up the whole GUI if the network is down
if( m_client->connect( false ) )
{
qDebug() << "Connected to the XMPP server";
emit connected();
QTimer::singleShot( 0, this, SLOT( doJabberRecv() ) );
}
else
qDebug() << "Could not connect to the XMPP server!";
}