From 517743a1bf2fab754182b53ba180be4043ed2148 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Mon, 30 Jan 2012 12:07:08 +0100 Subject: Fix drag & drop issues with non-local URLs BUG: 292821 BUG: 292355 FIXED-IN: 4.8.1 --- src/views/draganddrophelper.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/views/draganddrophelper.cpp') diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index 91eb4267d..83673ad72 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -28,13 +28,10 @@ #include #include -QString DragAndDropHelper::dropUrls(const KFileItem& destItem, QDropEvent* event) +QString DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUrl& destUrl, QDropEvent* event) { - Q_ASSERT(!destItem.isNull()); - - const KUrl destination = destItem.url(); - if (!destItem.isWritable()) { - return i18nc("@info:status", "Access denied. Could not write to %1", destination.pathOrUrl()); + if (!destItem.isNull() && !destItem.isWritable()) { + return i18nc("@info:status", "Access denied. Could not write to %1", destUrl.pathOrUrl()); } const QMimeData* mimeData = event->mimeData(); @@ -42,17 +39,17 @@ QString DragAndDropHelper::dropUrls(const KFileItem& destItem, QDropEvent* event const QString remoteDBusClient = mimeData->data("application/x-kde-dndextract"); QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, "/DndExtract", "org.kde.DndExtract", "extractSelectedFilesTo"); - message.setArguments(QVariantList() << destination.pathOrUrl()); + message.setArguments(QVariantList() << destUrl.pathOrUrl()); QDBusConnection::sessionBus().call(message); } else { const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); foreach (const KUrl& url, urls) { - if (url == destination) { + if (url == destUrl) { return i18nc("@info:status", "A folder cannot be dropped into itself"); } } - KonqOperations::doDrop(destItem, destination, event, QApplication::activeWindow()); + KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow()); } return QString(); -- cgit v1.3