[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=73e3307

The following commit has been merged in the master branch:
commit 73e3307a06eb0c8dadd97481cf31584092154bea
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Jun 1 13:35:48 2013 +0100

    Don't supress requested disconnections only to add the error anyway
---
 error-handler.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/error-handler.cpp b/error-handler.cpp
index f830e9f..2b84784 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -179,9 +179,7 @@ void ErrorHandler::onConnectionStatusChanged(const Tp::ConnectionStatus status)
         //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);
-        }
-
-        if (!m_errorMap.contains(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.
         }

-- 
ktp-kded-integration-module packaging