[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=611db1a

The following commit has been merged in the master branch:
commit 611db1abe8640116c8ca9b9818d302988bc5b24f
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Sun Nov 17 12:05:39 2013 +0100

    Port context menu to actions from kpeople2
---
 context-menu.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/context-menu.cpp b/context-menu.cpp
index f20a159..2ec5fcb 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -45,6 +45,8 @@
 #ifdef HAVE_KPEOPLE
 #include <kpeople/personpluginmanager.h>
 #include <kpeople/widgets/persondetailsdialog.h>
+#include <kpeople/global.h>
+#include <kpeople/personsmodel.h>
 #endif
 
 #include "dialogs/remove-contact-dialog.h"
@@ -102,8 +104,10 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
 
     if (KTp::kpeopleEnabled()) {
     #ifdef HAVE_KPEOPLE
-        menu->addActions(KPeople::PersonPluginManager::actionsForPerson(
-            KPeople::PersonData::createFromUri(index.data(KTp::NepomukUriRole).toString()), menu));
+        menu->addActions(
+            KPeople::actionsForPerson(index.data(KPeople::PersonsModel::PersonVCardRole).value<KABC::Addressee>(),
+                                      index.data(KPeople::PersonsModel::ContactsVCardRole).value<KABC::AddresseeList>(),
+                                      menu));
     #endif
     } else {
         //must be a QAction because menu->addAction returns QAction, breaks compilation otherwise

-- 
ktp-contact-list packaging