[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=8f9a1f8

The following commit has been merged in the master branch:
commit 8f9a1f822dfa74bd8fe2155373d2d3a0b6569337
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Dec 1 19:41:20 2013 +0100

    Restore show contact info dialog
    
    REVIEW: 114240
---
 context-menu.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/context-menu.cpp b/context-menu.cpp
index c1dd9a0..af5264d 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -350,15 +350,14 @@ void ContextMenu::onShowInfoTriggered()
 
     if (KTp::kpeopleEnabled()) {
     #ifdef HAVE_KPEOPLE
-        //FIXME-KPEOPLE
-//         const QUrl &uri = m_currentIndex.data(KTp::NepomukUriRole).toUrl();
-//         KPeople::PersonDataPtr person = KPeople::PersonData::createFromUri(uri);
-//         if (person->isValid()) {
-//             KPeople::PersonDetailsDialog *view = new KPeople::PersonDetailsDialog(m_mainWidget);
-//             view->setPerson(person);
-//             view->setAttribute(Qt::WA_DeleteOnClose);
-//             view->show();
-//         }
+        const QString &personId = m_currentIndex.data(KTp::PersonIdRole).toString();
+        if (!personId.isEmpty()) {
+            KPeople::PersonDetailsDialog *view = new KPeople::PersonDetailsDialog(m_mainWidget);
+            KPeople::PersonData *person = new KPeople::PersonData(personId, view);
+            view->setPerson(person);
+            view->setAttribute(Qt::WA_DeleteOnClose);
+            view->show();
+        }
     #endif
     } else {
         const Tp::AccountPtr &account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();

-- 
ktp-contact-list packaging