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

The following commit has been merged in the master branch:
commit c728def1eb3b674631533b850c8ffc8dcfd3b1c7
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Jan 3 18:46:18 2014 +0100

    Add new role for retrieving contact's VCard in form of KABC::Addressee
    
    Reviewed-by: David Edmundson
---
 CMakeLists.txt                         | 2 +-
 KTp/Models/kpeopletranslationproxy.cpp | 2 ++
 KTp/types.h                            | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89d149c..c106bb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ cmake_policy(SET CMP0002 OLD)
 
 set (KTP_VERSION "0.7.0")
 # Bump for every 0.x release, or whenever BC changes
-set (KTP_SONUMBER 6)
+set (KTP_SONUMBER 7)
 set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "4")
 
 find_package (KDE4 REQUIRED)
diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index 59b1699..ce19ad0 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -93,6 +93,8 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
             return mapToSource(proxyIndex).data(PersonsModel::GroupsRole);
         case KTp::PersonIdRole:
             return mapToSource(proxyIndex).data(PersonsModel::PersonIdRole);
+        case KTp::ContactVCardRole:
+            return mapToSource(proxyIndex).data(KPeople::PersonsModel::PersonVCardRole);
     }
 
     const KABC::AddresseeList &contacts = mapToSource(proxyIndex).data(PersonsModel::ContactsVCardRole).value<KABC::AddresseeList>();
diff --git a/KTp/types.h b/KTp/types.h
index 291eb02..3c3f60d 100644
--- a/KTp/types.h
+++ b/KTp/types.h
@@ -78,6 +78,8 @@ namespace KTp
         ContactCanVideoCallRole, ///< bool. You and contact can both video call
         ContactTubesRole, ///< stringlist. common supported dbus + stream services between you and contact
 
+        ContactVCardRole, ///< VCard of the contact in KABC::Addresse format; KPeople only at the moment
+
         //heading roles
         HeaderTotalUsersRole = Qt::UserRole  + 3000,
         HeaderOnlineUsersRole,

-- 
ktp-common-internals packaging