[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=3a5ac48

The following commit has been merged in the master branch:
commit 3a5ac48aba05e8fbd93c8463775a5eababe35029
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Nov 22 19:31:39 2013 +0100

    Expose PersonId Role
---
 KTp/Models/kpeopletranslationproxy.cpp | 4 ++--
 KTp/types.h                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index 1a5abf6..23e7783 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -93,8 +93,8 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
 //             return sourceModel()->rowCount(mapToSource(proxyIndex));
         case KTp::ContactGroupsRole:
             return mapToSource(proxyIndex).data(PersonsModel::GroupsRole);
-//         case KTp::NepomukUriRole:
-//             return mapToSource(proxyIndex).data(PersonsModel::UriRole);
+        case KTp::NepomukUriRole:
+            return mapToSource(proxyIndex).data(PersonsModel::PersonIdRole);
     }
 
     const KABC::AddresseeList &contacts = mapToSource(proxyIndex).data(PersonsModel::ContactsVCardRole).value<KABC::AddresseeList>();
diff --git a/KTp/types.h b/KTp/types.h
index a43bc2c..f6ee442 100644
--- a/KTp/types.h
+++ b/KTp/types.h
@@ -46,7 +46,7 @@ namespace KTp
         // general roles
         RowTypeRole = Qt::UserRole, //returns one of KTp::ContactRowType, KTp::PersonRowType, KTp::GroupRowType, KTp::AccountRowType
         IdRole, //returns Contact ID, Account UID, or group ID (group name or "_ungrouped")
-        NepomukUriRole, ///< url of the corresponding contact/person resource in Nepomuk
+        NepomukUriRole, ///< url of the corresponding contact/person resource in Nepomuk FIXME FIXME FIXME
 
         //telepathy roles
         ContactRole = Qt::UserRole + 1000,  ///<return Tp::ContactPtr

-- 
ktp-common-internals packaging