[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=25c1c83

The following commit has been merged in the master branch:
commit 25c1c836930055cf3153f04642c5333265cd3794
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Sep 2 16:09:16 2013 +0100

    Allow drag + drop contacts with people
    
    BUG: 324401
    REVIEW: 112452
---
 contact-list-widget.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index b290bab..a741b3e 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -734,7 +734,8 @@ void ContactListWidget::dropEvent(QDropEvent *event)
             requestFileTransferChannels(account, contact, filenames);
             event->acceptProposedAction();
         }
-    } else if (index.data(KTp::RowTypeRole).toInt() == KTp::ContactRowType && event->mimeData()->hasFormat("application/vnd.kpeople.uri")) {
+    } else if ((index.data(KTp::RowTypeRole).toInt() == KTp::ContactRowType || index.data(KTp::RowTypeRole).toInt() == KTp::PersonRowType) &&
+        event->mimeData()->hasFormat("application/vnd.kpeople.uri")) {
         if (KTp::kpeopleEnabled()) {
             #ifdef HAVE_KPEOPLE
             QUrl droppedUri(index.data(KTp::NepomukUriRole).toUrl());
@@ -892,6 +893,9 @@ void ContactListWidget::dragMoveEvent(QDragMoveEvent *event)
     } else if (event->mimeData()->hasFormat("application/vnd.telepathy.contact")) {
         event->acceptProposedAction();
         setDropIndicatorRect(visualRect(index));
+    } else if (event->mimeData()->hasFormat("application/vnd.kpeople.uri")) {
+        event->acceptProposedAction();
+        setDropIndicatorRect(visualRect(index));
     } else {
         event->ignore();
     }

-- 
ktp-contact-list packaging