[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=24bd66e

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

    Switch accounts model list to ErrorDictionary
---
 src/CMakeLists.txt          | 1 +
 src/accounts-list-model.cpp | 7 +++++--
 src/common                  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b177e2..221c70f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,6 +7,7 @@ add_subdirectory (KCMTelepathyAccounts)
 project (telepathy-accounts-kcm)
 
 set (telepathy_accounts_kcm_SRCS
+     common/error-dictionary.cpp
      kcm-telepathy-accounts.cpp
      accounts-list-model.cpp
      account-item.cpp
diff --git a/src/accounts-list-model.cpp b/src/accounts-list-model.cpp
index 3e8f707..a40adfd 100644
--- a/src/accounts-list-model.cpp
+++ b/src/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;
     }
 
diff --git a/src/common b/src/common
index 2498f4d..b748bcf 160000
--- a/src/common
+++ b/src/common
@@ -1 +1 @@
-Subproject commit 2498f4d585ffdfd4bf883fe7e4e1521d5d9f6644
+Subproject commit b748bcfeff92a3f356735341f28663793959e446

-- 
ktp-accounts-kcm packaging