[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=56454a6

The following commit has been merged in the master branch:
commit 56454a6a120e28e99e95556017b211ef2f34829b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Oct 26 17:19:50 2011 +0100

    Fix error message in accounts KCM
---
 src/account-item.cpp        | 15 ++++++---------
 src/accounts-list-model.cpp |  3 +--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/account-item.cpp b/src/account-item.cpp
index 471a436..32b7b6d 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -23,6 +23,7 @@
 #include "accounts-list-model.h"
 #include "edit-account-dialog.h"
 
+#include "common/error-dictionary.h"
 
 #include <KApplication>
 #include <KDebug>
@@ -120,20 +121,16 @@ const KIcon AccountItem::connectionStateIcon() const
 }
 
 const QString AccountItem::connectionStatusReason() const
-{
+{ 
     if (!m_account->isEnabled()) {
         return i18n("Account disabled - Click checkbox to enable");
     }
-
-    switch (m_account->connectionStatusReason())
-    {
-    case Tp::ConnectionStatusReasonAuthenticationFailed:
-        return i18n("Authentication Failed");
-    case Tp::ConnectionStatusReasonNetworkError:
-        return i18n("Network Error");
-    default:
+    else if (m_account->connectionStatusReason() == Tp::ConnectionStatusReasonRequested) {
         return QString();
     }
+    else {
+        return ErrorDictionary::instance()->displayShortErrorMessage(m_account->connectionError());
+    }
 }
 
 const QString AccountItem::connectionProtocolName() const
diff --git a/src/accounts-list-model.cpp b/src/accounts-list-model.cpp
index a40adfd..d8f9906 100644
--- a/src/accounts-list-model.cpp
+++ b/src/accounts-list-model.cpp
@@ -27,7 +27,6 @@
 
 #include <TelepathyQt4/Account>
 
-#include "common/error-dictionary.h"
 
 AccountsListModel::AccountsListModel(QObject *parent)
  : QAbstractListModel(parent)
@@ -98,7 +97,7 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
         break;
 
     case AccountsListModel::ConnectionErrorMessageDisplayRole:
-        data = QVariant(ErrorDictionary::instance()->displayShortErrorMessage(m_accounts.at(index.row())->account().data()->connectionError()));
+        data = QVariant(m_accounts.at(index.row())->connectionStatusReason());
         break;
 
     case AccountsListModel::ConnectionProtocolNameRole:

-- 
ktp-accounts-kcm packaging