[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=a0e620d

The following commit has been merged in the master branch:
commit a0e620dc267304d430ed07795a15077ec0e199f2
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Oct 26 12:12:58 2011 +0200

    Switch accounts model list to ErrorDictionary
---
 KTp/Models/accounts-list-model.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index 3e8f707..a40adfd 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -27,6 +27,8 @@
 
 #include <TelepathyQt4/Account>
 
+#include "common/error-dictionary.h"
+
 AccountsListModel::AccountsListModel(QObject *parent)
  : QAbstractListModel(parent)
 {
@@ -96,7 +98,7 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
         break;
 
     case AccountsListModel::ConnectionErrorMessageDisplayRole:
-        data = QVariant(m_accounts.at(index.row())->connectionStatusReason());
+        data = QVariant(ErrorDictionary::instance()->displayShortErrorMessage(m_accounts.at(index.row())->account().data()->connectionError()));
         break;
 
     case AccountsListModel::ConnectionProtocolNameRole:
@@ -115,9 +117,10 @@ bool AccountsListModel::setData(const QModelIndex &index, const QVariant &value,
     if(!index.isValid()) {
         return false;
     }
-
+    kDebug();
     if(role == Qt::CheckStateRole) {
         m_accounts.at(index.row())->account()->setEnabled(value.toInt() == Qt::Checked);
+        kDebug() << "shit";
         return true;
     }
 

-- 
ktp-common-internals packaging