From d8023b285f033e4a53004fbf162a78aaa0ae98ed Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Wed, 4 May 2011 14:36:05 +0200
Subject: [PATCH] sipjreen: improve staying-online
---
src/sip/jreen/jabber.cpp | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/sip/jreen/jabber.cpp b/src/sip/jreen/jabber.cpp
index f85669947..9dfe42ecc 100644
--- a/src/sip/jreen/jabber.cpp
+++ b/src/sip/jreen/jabber.cpp
@@ -294,9 +294,6 @@ JabberPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
qDebug() << Q_FUNC_INFO;
QString errorMessage;
- bool reconnect = false;
- int reconnectInSeconds = 0;
-
switch( reason )
{
case Jreen::Client::User:
@@ -313,19 +310,15 @@ JabberPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
break;
case Jreen::Client::RemoteStreamError:
errorMessage = "Remote Stream Error";
- reconnect = true;
break;
case Jreen::Client::RemoteConnectionFailed:
errorMessage = "Remote Connection failed";
break;
case Jreen::Client::InternalServerError:
errorMessage = "Internal Server Error";
- reconnect = true;
break;
case Jreen::Client::SystemShutdown:
errorMessage = "System shutdown";
- reconnect = true;
- reconnectInSeconds = 60;
break;
case Jreen::Client::Conflict:
errorMessage = "Conflict";
@@ -341,6 +334,7 @@ JabberPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
break;
}
+ bool reconnect = false;
switch( reason )
{
case Jreen::Client::User:
@@ -359,6 +353,7 @@ JabberPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
case Jreen::Client::Conflict:
case Jreen::Client::Unknown:
emit error( SipPlugin::ConnectionError, errorMessage );
+ reconnect = true;
break;
default:
@@ -372,7 +367,7 @@ JabberPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
removeMenuHelper();
if(reconnect)
- QTimer::singleShot(reconnectInSeconds*1000, this, SLOT(connectPlugin()));
+ QTimer::singleShot(15*1000, this, SLOT(connectPlugin()));
}
void