[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=101cabe

The following commit has been merged in the master branch:
commit 101cabe6f6c38216176d9ed4fb0a89a76bc0b12a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Oct 2 23:05:10 2012 +0100

    Update widgets away from using ContactModelItem
---
 KTp/Models/contacts-model.cpp       | 3 ---
 KTp/Widgets/contact-grid-widget.cpp | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index 95a7784..5101cf4 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -125,9 +125,6 @@ void ContactsModel::setAccountManager(const Tp::AccountManagerPtr &am)
         kDebug() << "account manager already set, ignoring";
     }
 
-    if (!am->isReady()) {
-        kDebug() << "Ready Account Manager expected";
-    }
     mPriv->mAM = am;
     Q_FOREACH (Tp::AccountPtr account, mPriv->mAM->allAccounts()) {
        onNewAccount(account);
diff --git a/KTp/Widgets/contact-grid-widget.cpp b/KTp/Widgets/contact-grid-widget.cpp
index c24e585..73be2ce 100644
--- a/KTp/Widgets/contact-grid-widget.cpp
+++ b/KTp/Widgets/contact-grid-widget.cpp
@@ -246,12 +246,12 @@ bool KTp::ContactGridWidget::hasSelection() const
 
 Tp::AccountPtr KTp::ContactGridWidget::selectedAccount() const
 {
-    return d->accountsModel->accountForContactItem(d->contactGridView->currentIndex().data(ContactsModel::ItemRole).value<ContactModelItem*>());
+    return d->contactGridView->currentIndex().data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
 }
 
 Tp::ContactPtr KTp::ContactGridWidget::selectedContact() const
 {
-    return d->contactGridView->currentIndex().data(ContactsModel::ItemRole).value<ContactModelItem*>()->contact();
+    return d->contactGridView->currentIndex().data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
 }
 
 AccountsFilterModel* KTp::ContactGridWidget::filter() const

-- 
ktp-common-internals packaging