From 5c732098f74535d7cfcafbf00837fe099f2cdaea Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Sun, 8 May 2011 15:42:53 +0200
Subject: [PATCH] sipjreen: turn stupid assert into a sensible error message

---
 src/sip/jreen/jabber.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/sip/jreen/jabber.cpp b/src/sip/jreen/jabber.cpp
index 9b2b7eeb1..0d7f37f75 100644
--- a/src/sip/jreen/jabber.cpp
+++ b/src/sip/jreen/jabber.cpp
@@ -139,11 +139,13 @@ JabberPlugin::~JabberPlugin()
 void
 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
-        qDebug() << Q_FUNC_INFO << "Jreen proxy only works when you explicitly set host and port";
-        Q_ASSERT(false);
+        emit error( SipPlugin::ConnectionError,
+                    errorMessage( tr( "You need to set hostname and port of your jabber server, if you want to use it through a proxy" ) ) );
         return;
     }