[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=06b457b

The following commit has been merged in the master branch:
commit 06b457ba5b679c7cea8c46154ed2e407d9f8649f
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Sep 3 02:07:36 2013 +0200

    Don't show a merge menu if dragging to the same item
    
    It's weird UI, so it's better to just skip it.
    
    Reviewed by David Edmundson
---
 contact-list-widget.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 1de5482..7c4c930 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -736,12 +736,11 @@ void ContactListWidget::dropEvent(QDropEvent *event)
             event->acceptProposedAction();
         }
     } 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());
-            QUrl draggedUri(event->mimeData()->data("application/vnd.kpeople.uri"));
-
+                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"));
+        if(droppedUri != draggedUri) {
             KMenu menu;
             QAction *mergeAction = menu.addAction(i18n("Merge contacts"));
             QAction *result = menu.exec(mapToGlobal(event->pos()));
@@ -749,8 +748,8 @@ void ContactListWidget::dropEvent(QDropEvent *event)
                 KPeople::PersonsModel::createPersonFromUris(QList<QUrl>() << droppedUri << draggedUri);
             }
             event->acceptProposedAction();
-            #endif
         }
+        #endif
     } else if (event->mimeData()->hasFormat("application/vnd.telepathy.contact")) {
         kDebug() << "Contact dropped";
 

-- 
ktp-contact-list packaging