[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=c2dbc3e

The following commit has been merged in the master branch:
commit c2dbc3e76d4a4c0ab516964507806d9efe6e2d01
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Jul 1 16:59:31 2013 +0200

    Add NepomukUriRole to access the uri of the given contact/person
    
    Reviewed-by: David Edmundson
---
 CMakeLists.txt                         | 4 ++--
 KTp/Models/kpeopletranslationproxy.cpp | 2 ++
 KTp/types.h                            | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2d0dc2..3402e0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,9 +8,9 @@ set (CMAKE_MODULE_PATH
 )
 cmake_policy(SET CMP0002 OLD)
 
-set (KTP_VERSION "0.6.2")
+set (KTP_VERSION "0.6.80")
 # Bump for every 0.x release, or whenever BC changes
-set (KTP_SONUMBER 5)
+set (KTP_SONUMBER 6)
 set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "4")
 
 find_package (KDE4 REQUIRED)
diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index 5f32de8..905141b 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -81,6 +81,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);
     }
 
     int j = sourceModel()->rowCount(mapToSource(proxyIndex));
diff --git a/KTp/types.h b/KTp/types.h
index 5f56b54..652a7ea 100644
--- a/KTp/types.h
+++ b/KTp/types.h
@@ -43,6 +43,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
 
         //telepathy roles
         ContactRole = Qt::UserRole + 1000,  ///<return Tp::ContactPtr

-- 
ktp-common-internals packaging