[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=69c307c

The following commit has been merged in the master branch:
commit 69c307cfded70fd820119b328ab5650e38c22c23
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Dec 9 16:20:03 2012 -0800

    Supress all errors unless we are connected to the network
    
    BUG: 303498
    REVIEW: 107654
    
    Conflicts:
    	error-handler.cpp
---
 error-handler.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/error-handler.cpp b/error-handler.cpp
index 972c7ad..c309f1c 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -50,6 +50,11 @@ void ErrorHandler::onConnectionStatusChanged(const Tp::ConnectionStatus status)
 {
     Tp::AccountPtr account(qobject_cast< Tp::Account* >(sender()));
 
+    //if we're not connected to the network, don't display any errors.
+    if (Solid::Networking::status() != Solid::Networking::Connected) {
+        return;
+    }
+
     if (status == Tp::ConnectionStatusDisconnected) {
         QString connectionError = account->connectionError();
 
@@ -67,10 +72,7 @@ void ErrorHandler::onConnectionStatusChanged(const Tp::ConnectionStatus status)
                 showMessageToUser(i18nc("%1 is the account name", "Could not connect %1. Authentication failed (is your password correct?)", account->displayName()), ErrorHandler::SystemMessageError);
                 break;
             case Tp::ConnectionStatusReasonNetworkError:
-                //if connected to the network, and there was a network error - display it. Otherwise do nothing.
-                if (Solid::Networking::status() == Solid::Networking::Connected) {
-                    showMessageToUser(i18nc("%1 is the account name", "Could not connect %1. There was a network error, check your connection", account->displayName()), ErrorHandler::SystemMessageError);
-                }
+                showMessageToUser(i18nc("%1 is the account name", "Could not connect %1. There was a network error, check your connection", account->displayName()), ErrorHandler::SystemMessageError);
                 break;
             default:
                 showMessageToUser(i18nc("%1 is the account name, %2 the error message", "There was a problem while trying to connect %1 - %2", account->displayName(), KTp::ErrorDictionary::displayVerboseErrorMessage(connectionError)), ErrorHandler::SystemMessageError);

-- 
ktp-kded-integration-module packaging