Merge remote branch 'asoliver/status'

Reviewed-by: Gustavo Pichorim Boiko <gustavo.boiko@collabora.co.uk>

1 files 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: {