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

The following commit has been merged in the master branch:
commit be96504132f5f1c877e863e1c31c422216a5fada
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Nov 17 17:50:31 2013 +0100

    Fix compile by disabling old merge/unmerge code
---
 contact-list-widget.cpp |  6 +++---
 main-widget.cpp         | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 0e7a54c..ad4d5ce 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -789,14 +789,14 @@ void ContactListWidget::dropEvent(QDropEvent *event)
     } else if ((index.data(KTp::RowTypeRole).toInt() == KTp::ContactRowType || index.data(KTp::RowTypeRole).toInt() == KTp::PersonRowType) &&
                 event->mimeData()->hasFormat("application/vnd.kpeople.uri") && KTp::kpeopleEnabled()) {
         #ifdef HAVE_KPEOPLE
-        QUrl droppedUri(index.data(KTp::NepomukUriRole).toUrl());
-        QUrl draggedUri(event->mimeData()->data("application/vnd.kpeople.uri"));
+        QString droppedUri(index.data(KTp::NepomukUriRole).toString());
+        QString draggedUri(event->mimeData()->data("application/vnd.kpeople.uri"));
         if(droppedUri != draggedUri) {
             KMenu menu;
             QAction *mergeAction = menu.addAction(i18n("Merge contacts"));
             QAction *result = menu.exec(mapToGlobal(event->pos()));
             if (result == mergeAction) {
-                KPeople::PersonsModel::createPersonFromUris(QList<QUrl>() << droppedUri << draggedUri);
+//                 KPeople::mergeContacts(QStringList << droppedUri << draggedUri);
             }
             event->acceptProposedAction();
         }
diff --git a/main-widget.cpp b/main-widget.cpp
index eb375b2..c6d6178 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -706,7 +706,7 @@ void MainWidget::onMetacontactToggleTriggered()
         //we're merging contacts
         bool invalid = false;
         QModelIndex person;
-        QList<QUrl> uris;
+        QStringList uris;
 
         Q_FOREACH (const QModelIndex &index, selection) {
             if (index.parent().isValid()
@@ -738,11 +738,11 @@ void MainWidget::onMetacontactToggleTriggered()
                 break;
             }
 
-            uris << index.data(KTp::NepomukUriRole).toUrl();
+            uris << index.data(KTp::NepomukUriRole).toString();
         }
 
         if (!invalid) {
-            KPeople::PersonsModel::createPersonFromUris(uris);
+//             KPeople::mergeContacts(uris);
         }
     } else {
         //we're removing contacts from person
@@ -767,7 +767,7 @@ void MainWidget::onMetacontactToggleTriggered()
                 }
             }
 
-            KPeople::PersonsModel::unlinkContactFromPerson(personUri, contacts);
+//             KPeople::PersonsModel::unlinkContactFromPerson(personUri, contacts);
 
         } else if (selection.size() > 1) {
             QModelIndex person;
@@ -801,7 +801,8 @@ void MainWidget::onMetacontactToggleTriggered()
             }
 
             if (!invalid) {
-                KPeople::PersonsModel::unlinkContactFromPerson(person.data(KTp::NepomukUriRole).toUrl(), contactUris);
+                //FXIME
+//                 KPeople::PersonsModel::unlinkContactFromPerson(person.data(KTp::NepomukUriRole).toUrl(), contactUris);
             }
         }
     }

-- 
ktp-contact-list packaging