[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=1a76586

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

    Disable person details dialog until it's ported
---
 context-menu.cpp | 17 +++++++++--------
 main-widget.cpp  |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/context-menu.cpp b/context-menu.cpp
index 2ec5fcb..c1dd9a0 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -350,14 +350,15 @@ void ContextMenu::onShowInfoTriggered()
 
     if (KTp::kpeopleEnabled()) {
     #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();
-        }
+        //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();
+//         }
     #endif
     } else {
         const Tp::AccountPtr &account = m_currentIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
diff --git a/main-widget.cpp b/main-widget.cpp
index 65beae8..eb375b2 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -274,6 +274,7 @@ void MainWidget::onMakeCallRequested()
 
 void MainWidget::onMergeContactsDialogRequested()
 {
+    /*
 #ifdef HAVE_KPEOPLE
     KPeople::MergeDialog* mergeDialog = new KPeople::MergeDialog(this);
     //create a new model that queries all the data otherwise we will only show IM contacts
@@ -283,6 +284,7 @@ void MainWidget::onMergeContactsDialogRequested()
     mergeDialog->show();
     mergeDialog->setAttribute(Qt::WA_DeleteOnClose);
 #endif
+*/
 }
 
 void MainWidget::closeEvent(QCloseEvent* e)

-- 
ktp-contact-list packaging