mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-06 14:16:32 +02:00
Merge branch 'master' into tweetsip
This commit is contained in:
@@ -150,11 +150,16 @@ Jabber_p::go()
|
|||||||
|
|
||||||
// Handle proxy
|
// 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 ) )
|
if( m_client->connect( false ) )
|
||||||
{
|
{
|
||||||
|
qDebug() << "Connected to the XMPP server";
|
||||||
emit connected();
|
emit connected();
|
||||||
QTimer::singleShot( 0, this, SLOT( doJabberRecv() ) );
|
QTimer::singleShot( 0, this, SLOT( doJabberRecv() ) );
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
qDebug() << "Could not connect to the XMPP server!";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user