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

The following commit has been merged in the master branch:
commit e2e6942ccde039d435a2d3785aa8772a9be5f454
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Aug 10 17:45:23 2013 +0100

    Always allow drag and drop in contact list
    
    KPeople can nearly always merge
---
 contact-list-widget.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 0a2c3b4..68f2dfa 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -879,9 +879,7 @@ void ContactListWidget::dragEnterEvent(QDragEnterEvent *event)
 
 void ContactListWidget::dragMoveEvent(QDragMoveEvent *event)
 {
-    Q_D(ContactListWidget);
-
-    QModelIndex index = indexAt(event->pos());
+    const QModelIndex index = indexAt(event->pos());
     setDropIndicatorRect(QRect());
 
     QAbstractItemView::dragMoveEvent(event);
@@ -891,11 +889,7 @@ void ContactListWidget::dragMoveEvent(QDragMoveEvent *event)
     if (event->mimeData()->hasUrls() && index.data(KTp::ContactCanFileTransferRole).toBool()) {
         event->acceptProposedAction();
         setDropIndicatorRect(visualRect(index));
-    } else if (event->mimeData()->hasFormat("application/vnd.telepathy.contact") &&
-               (index.data(KTp::RowTypeRole).toInt() == KTp::GroupRowType ||
-                index.data(KTp::RowTypeRole).toInt() == KTp::ContactRowType)
-               && d->model->groupMode() == KTp::ContactsModel::GroupGrouping) {
-        // Contacts dropping is only allowed if groups are enabled in appearance settings.
+    } else if (event->mimeData()->hasFormat("application/vnd.telepathy.contact")) {
         event->acceptProposedAction();
         setDropIndicatorRect(visualRect(index));
     } else {

-- 
ktp-contact-list packaging