[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=f46d52c

The following commit has been merged in the master branch:
commit f46d52c93bdf0ad202eda6463859086e80de4d57
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Oct 31 16:29:49 2014 +0100

    Use QtQuick DropArea component
---
 .../contents/ui/ConversationDelegateButton.qml             | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
index 67b97f4..e9e9fef 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
@@ -22,7 +22,6 @@ import QtQuick 2.1
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0 as ExtraComponents
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.draganddrop 2.0 as DnD
 import org.kde.telepathy 0.1
 
 PlasmaComponents.ToolButton
@@ -38,7 +37,7 @@ PlasmaComponents.ToolButton
 
     PlasmaCore.IconItem {
         id: icon
-        opacity: dropArea.dragging ? 0.5 : 1
+        opacity: dropArea.containsDrag ? 0.5 : 1
         anchors {
             fill: parent
         }
@@ -55,17 +54,14 @@ PlasmaComponents.ToolButton
 //         acceptedButtons: null
 //     }
     
-    DnD.DropArea {
+    DropArea {
         id: dropArea
-        property bool dragging: false
 
         anchors.fill: parent
-        onDrop: if (event.mimeData.url!="") {
-            telepathyManager.startFileTransfer(parent.account, parent.contact, event.mimeData.url);
-            dragging=false
+        onDropped: {
+            for(var url in drop.urls)
+                telepathyManager.startFileTransfer(parent.account, parent.contact, url);
         }
-        onDragEnter: dragging=true
-        onDragLeave: dragging=false
     }
     
     Loader {

-- 
ktp-contact-applet packaging