[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=c9a047e

The following commit has been merged in the master branch:
commit c9a047e4c1f78843d15b2b446c154453aeef1504
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 14 22:04:38 2014 +0200

    In the event of a connection error, try again
    
    Seems to solve a lot of mysterious "user has cancelled" errors
    
    Reviewed-by: Thomas Pfieffer
---
 error-handler.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/error-handler.cpp b/error-handler.cpp
index 3cd38b8..afd5af9 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -176,12 +176,14 @@ void ErrorHandler::onConnectionStatusChanged(const Tp::ConnectionStatus status)
     }
 
     if (status == Tp::ConnectionStatusDisconnected) {
-        //if this is the first error for this account, store the details of the error to show
+        //if we're deliberately disconnected do nothing
+        //else if this is the first error for this account, store the details of the error to show
         if (account->connectionStatusReason() == Tp::ConnectionStatusReasonRequested) {
             m_errorMap.remove(account);
         } else if (!m_errorMap.contains(account)) {
             m_errorMap.insert(account, ConnectionError(account->connectionStatusReason(), account->connectionError(), account->connectionErrorDetails()));
             QTimer::singleShot(30 * 1000, this, SLOT(showErrorNotification())); //a timer is kept per account because we want to show 30 seconds after the first still valid error.
+            account->reconnect();
         }
 
     } else  if (status == Tp::ConnectionStatusConnected) {

-- 
ktp-kded-integration-module packaging