[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=866aa6c

The following commit has been merged in the master branch:
commit 866aa6c8de213a79c20a84ee3ca9d71ec2a3a41e
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Feb 27 03:28:52 2012 +0100

    Return the string "Disabled" instead of "Disconnected" for disabled accounts
---
 src/account-item.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/account-item.cpp b/src/account-item.cpp
index aab3482..b90559a 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -94,15 +94,19 @@ const KIcon& AccountItem::icon() const
 
 const QString AccountItem::connectionStateString() const
 {
-    switch (m_account->connectionStatus()) {
-    case Tp::ConnectionStatusConnected:
-        return i18n("Online");
-    case Tp::ConnectionStatusConnecting:
-        return i18nc("This is a connection state", "Connecting");
-    case Tp::ConnectionStatusDisconnected:
-        return i18nc("This is a connection state", "Disconnected");
-    default:
-        return i18nc("This is an unknown connection state", "Unknown");
+    if (m_account->isEnabled()) {
+        switch (m_account->connectionStatus()) {
+        case Tp::ConnectionStatusConnected:
+            return i18n("Online");
+        case Tp::ConnectionStatusConnecting:
+            return i18nc("This is a connection state", "Connecting");
+        case Tp::ConnectionStatusDisconnected:
+            return i18nc("This is a connection state", "Disconnected");
+        default:
+            return i18nc("This is an unknown connection state", "Unknown");
+        }
+    } else {
+        return i18nc("This is a disabled account", "Disabled");
     }
 }
 

-- 
ktp-accounts-kcm packaging