* show an error message instead of an information message when an invalid dragging is done

* show an error message if a folder is dropped on to itself

svn path=/trunk/KDE/kdebase/apps/; revision=883836

1 files changed, 2 insertions, 10 deletions

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 3f0b215cc..d93ff83e4 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -115,8 +115,8 @@ DolphinMainWindow::DolphinMainWindow(int id) :
             this, SLOT(showCommand(CommandType)));
     connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)),
             this, SLOT(showErrorMessage(const QString&)));
-    connect(&DragAndDropHelper::instance(), SIGNAL(informationMessage(const QString&)),
-            this, SLOT(showInformationMessage(const QString&)));
+    connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(const QString&)),
+            this, SLOT(showErrorMessage(const QString&)));
 }
 
 DolphinMainWindow::~DolphinMainWindow()
@@ -450,14 +450,6 @@ void DolphinMainWindow::showErrorMessage(const QString& message)
     }
 }
 
-void DolphinMainWindow::showInformationMessage(const QString& message)
-{
-    if (!message.isEmpty()) {
-        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
-        statusBar->setMessage(message, DolphinStatusBar::Information);
-    }
-}
-
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));