[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=68e2e30

The following commit has been merged in the master branch:
commit 68e2e30e9820d0b6fe146e1dceb9313e7a3f968c
Author: David Edmundson <david at davidedmundson.co.uk>
Date:   Tue Apr 16 11:15:57 2013 +0000

    Make sure to supress any remaining connection cancelled messages
    
    If authentication fails becomes the user cancels or because the password is wrong
    the connection still has the same ConnectionStatusReason
    
    We want to supress user cancelled auth so we check the connectionError string which
    is more detailed and gives the reason the auth failed
    
    REVIEW: 110028
    BUG: 285172
    FIXED-IN: 0.6.1
---
 error-handler.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/error-handler.cpp b/error-handler.cpp
index 7149f75..0be2970 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -142,6 +142,9 @@ void ErrorHandler::showErrorNotification()
                 errorMessage += i18nc("%1 is the account name", "Could not connect %1. There was a network error, check your connection", account->displayName()) + QLatin1Char('
');
                 break;
             default:
+	        if (error.connectionError() == QLatin1String(TP_QT_ERROR_CANCELLED)) {
+		    break;
+		}
                 if (error.connectionErrorDetails().hasServerMessage()) {
                     errorMessage += i18nc("%1 is the account name, %2 the error message", "There was a problem while trying to connect %1 - %2", account->displayName(), error.connectionErrorDetails().serverMessage()) + QLatin1Char('
');
                 } else {

-- 
ktp-kded-integration-module packaging