[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=5395d20

The following commit has been merged in the master branch:
commit 5395d20b05058f451111a6be99092a27b71a768a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Nov 14 10:25:37 2012 +0900

    Update to match latest common-internals
    
    REVIEW: 107320
---
 src/accounts-list-delegate.cpp | 2 +-
 src/kcm-telepathy-accounts.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/accounts-list-delegate.cpp b/src/accounts-list-delegate.cpp
index c939fe4..31ee080 100644
--- a/src/accounts-list-delegate.cpp
+++ b/src/accounts-list-delegate.cpp
@@ -122,7 +122,7 @@ void AccountsListDelegate::updateItemWidgets(const QList<QWidget *> widgets, con
 
 
     bool isSelected(itemView()->selectionModel()->isSelected(index) && itemView()->hasFocus());
-    bool isEnabled(index.data(Qt::CheckStateRole).toBool());
+    bool isEnabled(index.data(AccountsListModel::EnabledRole).toBool());
     KIcon accountIcon(index.data(Qt::DecorationRole).value<QIcon>());
     KIcon statusIcon(index.data(AccountsListModel::ConnectionStateIconRole).value<QIcon>());
     QString statusText(index.data(AccountsListModel::ConnectionStateDisplayRole).toString());
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 854a675..ffc0e37 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -50,6 +50,7 @@
 #include <KTp/logs-importer.h>
 
 #include <TelepathyQt/Account>
+#include <TelepathyQt/AccountSet>
 #include <TelepathyQt/AccountFactory>
 #include <TelepathyQt/PendingOperation>
 #include <TelepathyQt/PendingReady>
@@ -222,7 +223,7 @@ void KCMTelepathyAccounts::onAccountEnabledChanged(const QModelIndex &index, boo
     else {
         value = QVariant(Qt::Unchecked);
     }
-    m_accountsListModel->setData(index, value, Qt::CheckStateRole);
+    m_accountsListModel->setData(index, value, AccountsListModel::EnabledRole);
 
     if (enabled) {
         // connect the account
@@ -242,7 +243,7 @@ void KCMTelepathyAccounts::onAccountManagerReady(Tp::PendingOperation *op)
         return;
     }
 
-    m_accountsListModel->setAccountManager(m_accountManager);
+    m_accountsListModel->setAccountSet(m_accountManager->validAccounts());
 }
 
 void KCMTelepathyAccounts::onNewAccountAdded(const Tp::AccountPtr& account)

-- 
ktp-accounts-kcm packaging