From 8b2faf016469d9c32f5d1d396bfb51de95e5125f Mon Sep 17 00:00:00 2001
From: Stefan Taferner <taferner@kde.org>
Date: Sat, 4 Apr 1998 20:32:23 +0000
Subject: [PATCH] * Filters: Removed warning dialog. Filters are working ok for
 me for several weeks now.

* Folders: After I finally also deleted lots of important messages
by mistake I now changed the behaviour of Folder->Empty to
move the messages into trash instead of deleting them ;-)
This made the "Are you sure" dialog now obsolete, IMO.

svn path=/trunk/kdenetwork/kmail/; revision=6506
---
 ChangeLog       | 10 ++++++++++
 kmfilterdlg.cpp |  2 --
 kmmainwin.cpp   | 11 ++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a680134a9..ad441a401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1998-04-04  Stefan Taferner  <taferner@kde.org>
+
+	* Filters: Removed warning dialog. Filters are working ok for
+	me for several weeks now.
+
+	* Folders: After I finally also deleted lots of important messages
+	by mistake I now changed the behaviour of Folder->Empty to
+	move the messages into trash instead of deleting them ;-)
+	This made the "Are you sure" dialog now obsolete, IMO.
+
 1998-03-31  Stefan Taferner  <taferner@kde.org> (KMail-0.6.5)
 
 	* Folders: fixed bug introduced on 1998-03-26: open failed on
diff --git a/kmfilterdlg.cpp b/kmfilterdlg.cpp
index f9bab9b5a..b64870ae7 100644
--- a/kmfilterdlg.cpp
+++ b/kmfilterdlg.cpp
@@ -56,8 +56,6 @@ KMFilterDlg::KMFilterDlg(QWidget* parent, const char* name):
 
   initMetaObject();
 
-  warning("Mail filters are still broken and unusable.");
-
   grid  = new QGridLayout(this, 3, 2, 4, 4);
   mFilter = NULL;
 
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index abcb7b05f..64976414c 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -324,21 +324,30 @@ void KMMainWin::slotModifyFolder()
 void KMMainWin::slotEmptyFolder()
 {
   QString str(256);
+  KMMessage* msg;
 
   if (!mFolder) return;
 
+#ifdef NOT_REQUIRED_ANYMORE
   str.sprintf(i18n("Are you sure you want to discard the\n"
 		   "contents of the folder \"%s\" ?"),
 	      (const char*)mFolder->label());
   if ((KMsgBox::yesNo(this,i18n("Confirmation"),str))==1)
   {
+#endif
     kbp->busy();
+    mFolder->open();
     mHeaders->setFolder(NULL);
     mMsgView->clear();
+    while ((msg = mFolder->take(0)) != NULL)
+      trashFolder->addMsg(msg);
+
+    mFolder->close();
     mFolder->expunge();
     mHeaders->setFolder(mFolder);
     kbp->idle();
-  }
+    statusMsg(i18n("Moved all messages into trash"));
+//}
 }