[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=9d6de51

The following commit has been merged in the master branch:
commit 9d6de517ebed4944b886c7ac601592f4f32efc98
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Feb 27 03:29:20 2012 +0100

    Do not return an icon for disabled accounts
---
 src/account-item.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/account-item.cpp b/src/account-item.cpp
index b90559a..73f3a24 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -112,16 +112,20 @@ const QString AccountItem::connectionStateString() const
 
 const KIcon AccountItem::connectionStateIcon() const
 {
-    switch (m_account->connectionStatus()) {
-    case Tp::ConnectionStatusConnected:
-        return KIcon(QLatin1String("user-online"));
-    case Tp::ConnectionStatusConnecting:
-        //imho this is not really worth animating, but feel free to play around..
-        return KIcon(KPixmapSequence(QLatin1String("process-working"), 22).frameAt(0));
-    case Tp::ConnectionStatusDisconnected:
-        return KIcon(QLatin1String("user-offline"));
-    default:
-        return KIcon(QLatin1String("user-offline"));
+    if (m_account->isEnabled()) {
+        switch (m_account->connectionStatus()) {
+        case Tp::ConnectionStatusConnected:
+            return KIcon(QLatin1String("user-online"));
+        case Tp::ConnectionStatusConnecting:
+            //imho this is not really worth animating, but feel free to play around..
+            return KIcon(KPixmapSequence(QLatin1String("process-working"), 22).frameAt(0));
+        case Tp::ConnectionStatusDisconnected:
+            return KIcon(QLatin1String("user-offline"));
+        default:
+            return KIcon(QLatin1String("user-offline"));
+        }
+    } else {
+        return KIcon();
     }
 }
 

-- 
ktp-accounts-kcm packaging