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

diff --cc src/views/dolphinview.cpp
index 9575ffba702f33de6cea6df8962135b147b1c181,502ffd428b5ee62d081c391cfdc3bafb7ae41abc..d1e154f68a5d1c9b5e3a8a1cd5f34dd2290c11f3
--- 1/src/views/dolphinview.cpp
--- 2/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)));
      }
  }