[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=48eeefd

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

    Fix error message in accounts KCM
---
 KTp/Models/accounts-list-model.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index a40adfd..d8f9906 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/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-common-internals packaging