[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=2a5145a

The following commit has been merged in the master branch:
commit 2a5145ace96b27ec78c3d59ffb99770b1f71e19e
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 11 14:25:19 2013 +0100

    Call parent's dragMoveEvent() before we accept() the event
    
    QAbstractItemView::dragMoveEvent() always calls event->ignore().
    Therefore it must be called before we call event->accept(),
    otherwise it would get overwritten.
    
    This makes drag&drop of contacts work again.
---
 contact-list-widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index d3ad541..a2b9556 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -765,6 +765,8 @@ void ContactListWidget::dragMoveEvent(QDragMoveEvent *event)
     QModelIndex index = indexAt(event->pos());
     setDropIndicatorRect(QRect());
 
+    QAbstractItemView::dragMoveEvent(event);
+
     // urls can be dropped on a contact with file transfer capability,
     // contacts can be dropped either on a group or on another contact if GroupsModel is used
     if (event->mimeData()->hasUrls() && index.data(KTp::ContactCanFileTransferRole).toBool()) {
@@ -778,7 +780,6 @@ void ContactListWidget::dragMoveEvent(QDragMoveEvent *event)
     } else {
         event->ignore();
     }
-    QAbstractItemView::dragMoveEvent(event);
 }
 
 void ContactListWidget::dragLeaveEvent(QDragLeaveEvent *event)

-- 
ktp-contact-list packaging