Adress the first round of Angelaccio's review comments

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index da35041878d4749971f928c9d47922a48001c66a..3cdad13fb7a83c80adaff9e33a20a610d11d0148 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -367,10 +367,13 @@ void DolphinViewContainer::disconnectUrlNavigator()
     updateNavigatorWidgetVisibility();
 }
 
-void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
+KMessageWidget *DolphinViewContainer::showMessage(const QString& msg, MessageType type)
 {
     if (msg.isEmpty()) {
-        return;
+        return m_messageWidget;
+    }
+    for (auto action : m_messageWidget->actions()) {
+        m_messageWidget->removeAction(action);
     }
 
     m_messageWidget->setText(msg);
@@ -396,6 +399,7 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
         m_messageWidget->hide();
     }
     m_messageWidget->animatedShow();
+    return m_messageWidget;
 }
 
 void DolphinViewContainer::readSettings()