mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00
Code Issues Releases Wiki Activity

sipjreen: turn stupid assert into a sensible error message

Browse Source
This commit is contained in:
Dominik Schmidt
2011-05-08 15:42:53 +02:00
parent 1987b4c378
commit 5c732098f7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sip/jreen/jabber.cpp
View File

@@ -139,11 +139,13 @@ JabberPlugin::~JabberPlugin()
void void
JabberPlugin::setProxy( const QNetworkProxy &proxy ) JabberPlugin::setProxy( const QNetworkProxy &proxy )
{ {
if(m_currentServer.isEmpty() || !(m_currentPort > 0)) qDebug() << Q_FUNC_INFO;
if( ( proxy.type() != QNetworkProxy::NoProxy ) && ( m_currentServer.isEmpty() || !(m_currentPort > 0) ) )
{ {
// patches are welcome in Jreen that implement jdns through proxy // patches are welcome in Jreen that implement jdns through proxy
qDebug() << Q_FUNC_INFO << "Jreen proxy only works when you explicitly set host and port"; emit error( SipPlugin::ConnectionError,
Q_ASSERT(false); errorMessage( tr( "You need to set hostname and port of your jabber server, if you want to use it through a proxy" ) ) );
return; return;
} }