From 304fa1fc556baebc4adf603f55065ca084696fa9 Mon Sep 17 00:00:00 2001
From: Alvaro Soliverez <alvaro.soliverez@collabora.co.uk>
Date: Mon, 6 Jun 2011 10:09:54 -0700
Subject: Use the connection status to return the status of the account model
 item

---
 TelepathyQt4Yell/Models/accounts-model-item.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/TelepathyQt4Yell/Models/accounts-model-item.cpp b/TelepathyQt4Yell/Models/accounts-model-item.cpp
index 1122003..5dc056b 100644
--- a/TelepathyQt4Yell/Models/accounts-model-item.cpp
+++ b/TelepathyQt4Yell/Models/accounts-model-item.cpp
@@ -175,8 +175,14 @@ QVariant AccountsModelItem::data(int role) const
             return mPriv->mAccount->requestedPresence().type();
         case AccountsModel::RequestedPresenceStatusMessageRole:
             return mPriv->mAccount->requestedPresence().statusMessage();
-        case AccountsModel::ConnectionStatusRole:
-            return mPriv->mAccount->connectionStatus();
+        case AccountsModel::ConnectionStatusRole: {
+            if (!mPriv->mAccount->connection().isNull()
+                    && mPriv->mAccount->connection()->isValid()) {
+                return mPriv->mAccount->connection()->status();
+            } else {
+                return Tp::ConnectionStatusDisconnected;
+            }
+        }
         case AccountsModel::ConnectionStatusReasonRole:
             return mPriv->mAccount->connectionStatusReason();
         case AccountsModel::ContactListStateRole: {
-- 
cgit v1.2.3