From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Thu, 24 Jan 2013 08:39:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/65010924210413c536cde7b1c930a7db350e59c7

Merge remote-tracking branch 'origin/KDE/4.10'
---

65010924210413c536cde7b1c930a7db350e59c7
diff --cc src/views/dolphinview.cpp
index 9575ffba7,502ffd428..d1e154f68
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@@ -1023,16 -1023,14 +1023,16 @@@ void DolphinView::slotItemDropEvent(in
                           event->buttons(),
                           event->modifiers());
  
 -    const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);
 +    QString error;
 +    KonqOperations* op = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent, error);
      if (!error.isEmpty()) {
-         emit errorMessage(error);
+         emit infoMessage(error);
      }
  
 -    if (destUrl == url()) {
 +    if (op && destUrl == url()) {
          // Mark the dropped urls as selected.
 -        markPastedUrlsAsSelected(event->mimeData());
 +        m_clearSelectionBeforeSelectingNewItems = true;
 +        connect(op, SIGNAL(urlPasted(KUrl)), this, SLOT(slotUrlPasted(KUrl)));
      }
  }