[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=91a39cd

The following commit has been merged in the master branch:
commit 91a39cd7b062a3636ec270c35550c50cd1dc24bd
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Dec 21 14:14:53 2012 +0000

    Use Tp::ContactPtr rather than KTp::ContactPtr for the ContactRole in ContactsModel
    
    This is a workaround for an issue in porting the contacts list in which QVariant::fromValue<Tp::ContactPtr>() now fails to work
---
 KTp/Models/contacts-list-model.cpp | 2 +-
 KTp/contact.h                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/Models/contacts-list-model.cpp b/KTp/Models/contacts-list-model.cpp
index b048f76..94128ba 100644
--- a/KTp/Models/contacts-list-model.cpp
+++ b/KTp/Models/contacts-list-model.cpp
@@ -74,7 +74,7 @@ QVariant KTp::ContactsListModel::data(const QModelIndex &index, int role) const
         case ContactsModel::TypeRole:
             return ContactsModel::ContactRowType;
         case ContactsModel::ContactRole:
-            return QVariant::fromValue(contact);
+            return QVariant::fromValue(d->contacts[row]); //Tp::ContactPtr and NOT KTp::ContactPtr
         case ContactsModel::AccountRole:
             return QVariant::fromValue(d->contactManager->accountForContact(contact));
         case Qt::DisplayRole:
diff --git a/KTp/contact.h b/KTp/contact.h
index 2d803b7..c332c7d 100644
--- a/KTp/contact.h
+++ b/KTp/contact.h
@@ -54,6 +54,6 @@ typedef Tp::SharedPtr<KTp::Contact> ContactPtr;
 
 }//namespace
 
-Q_DECLARE_METATYPE(KTp::ContactPtr)
+// Q_DECLARE_METATYPE(KTp::ContactPtr)
 
 #endif // CONTACT_H

-- 
ktp-common-internals packaging