[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=44d68d2

The following commit has been merged in the master branch:
commit 44d68d20b91ffd802cc1b29c896d8e605d8bc263
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jul 24 08:42:39 2013 +0100

    Show PersonDetailsDialog for "show info" if in KPeople mode
---
 CMakeLists.txt   |  6 ++++--
 context-menu.cpp | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9a8e6f..eb22ccd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ macro_display_feature_log()
 
 if (KPEOPLE_FOUND)
     add_definitions(-DHAVE_KPEOPLE)
+    include_directories(${KPEOPLE_INCLUDES})
 endif (KPEOPLE_FOUND)
 
 include (KDE4Defaults)
@@ -36,7 +37,7 @@ include_directories (${KDE4_INCLUDES}
 )
 
 
-set (ktp_contactlist_SRCS
+set (ktp_contactlist_SRCS 
      contact-list-widget.cpp
      context-menu.cpp
      abstract-contact-delegate.cpp
@@ -78,7 +79,8 @@ set (ktp_contactlist_LIBS
 if(KPEOPLE_FOUND)
 set (ktp_contactlist_LIBS
     ${ktp_contactlist_LIBS}
-    kpeople
+    ${KPEOPLE_LIBRARY}
+    ${KPEOPLEWIDGETS_LIBRARY}
 )
 endif(KPEOPLE_FOUND)
 
diff --git a/context-menu.cpp b/context-menu.cpp
index a48b10a..f5e34c1 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -46,6 +46,7 @@
 
 #ifdef HAVE_KPEOPLE
 #include <kpeople/personpluginmanager.h>
+#include <kpeople/widgets/persondetailsdialog.h>
 #endif
 
 #include "dialogs/remove-contact-dialog.h"
@@ -346,13 +347,24 @@ void ContextMenu::onShowInfoTriggered()
         return;
     }
 
-    Tp::AccountPtr account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
-    Tp::ContactPtr contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
+#ifdef HAVE_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();
+    }
+#else
+    const Tp::AccountPtr &account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
+    const Tp::ContactPtr &contact = m_currentIndex.data(KTp::ContactRole).value<KTp::ContactPtr>();
     if (account && contact) {
         KTp::ContactInfoDialog* contactInfoDialog = new KTp::ContactInfoDialog(account, contact, m_mainWidget);
         contactInfoDialog->setAttribute(Qt::WA_DeleteOnClose);
         contactInfoDialog->show();
     }
+#endif
 }
 
 void ContextMenu::onStartTextChatTriggered()

-- 
ktp-contact-list packaging