Fix drag & drop issues with non-local URLs

BUG: 292821
BUG: 292355
FIXED-IN: 4.8.1

2 files changed, 3 insertions, 8 deletions

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index d9c8f71dc..1a61f0141 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -263,11 +263,7 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve
         KFileItemModel* model = fileItemModel();
         KFileItem destItem = model->fileItem(index);
         if (destItem.isNull()) {
-            destItem = model->rootItem();
-            if (destItem.isNull()) {
-                kWarning() << "No destination item available for drop operation.";
-                return;
-            }
+            return;
         }
 
         QDropEvent dropEvent(event->pos().toPoint(),
@@ -276,7 +272,7 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve
                              event->buttons(),
                              event->modifiers());
 
-        DragAndDropHelper::dropUrls(destItem, &dropEvent);
+        DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent);
     }
 }
 
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 6f522fad2..902c436cf 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -48,8 +48,7 @@ void PlacesPanel::mousePressEvent(QMouseEvent* event)
 void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
 {
     Q_UNUSED(parent);
-    const KFileItem destItem(KFileItem::Unknown, KFileItem::Unknown, dest);
-    DragAndDropHelper::dropUrls(destItem, event);
+    DragAndDropHelper::dropUrls(KFileItem(), dest, event);
 }
 
 void PlacesPanel::emitExtendedUrlChangedSignal(const KUrl& url)