Don't ask twice whether the trash should get emptied

Thanks to Casey Jones for the patch!

BUG: 265785
FIXED-IN: 4.7.0

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 79ffdaa2eca6451230224aa6be54af5b3624c5fc..7aac7707bb7c161698ef0e0122b5ab10fec5b2d9 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -189,16 +189,7 @@ void DolphinContextMenu::openTrashContextMenu()
 
     QAction *action = m_popup->exec(QCursor::pos());
     if (action == emptyTrashAction) {
 
     QAction *action = m_popup->exec(QCursor::pos());
     if (action == emptyTrashAction) {

-        const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will be deleted."));
-        const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
-                                                            text,
-                                                            QString(),
-                                                            KGuiItem(i18nc("@action:button", "Empty Trash"),
-                                                                     KIcon("user-trash"))
-                                                           ) == KMessageBox::Continue;
-        if (del) {
-            KonqOperations::emptyTrash(m_mainWindow);
-        }
+        KonqOperations::emptyTrash(m_mainWindow);

     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {