From b5a78452a9ed84ff82c84e31f0a0ec892f3b5cfb Mon Sep 17 00:00:00 2001
From: Stefan Taferner <taferner@kde.org>
Date: Tue, 28 Apr 1998 19:41:44 +0000
Subject: [PATCH] Folders: Emptying of the trash folder resulted in an infinite
 loop. Fixed now.

svn path=/trunk/kdenetwork/kmail/; revision=7098
---
 ChangeLog     | 7 ++++++-
 kmmainwin.cpp | 7 +++++--
 kmversion.h   | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad441a401..8476a3b61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-1998-04-04  Stefan Taferner  <taferner@kde.org>
+1998-04-28  Stefan Taferner  <taferner@kde.org> (KMail-0.6.6)
+
+	* Folders: Emptying of the trash folder resulted in an infinite 
+	loop. Fixed now.
+
+1998-04-04  Stefan Taferner  <taferner@kde.org> (Kde Beta-4)
 
 	* Filters: Removed warning dialog. Filters are working ok for
 	me for several weeks now.
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index 64976414c..53878efca 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -339,9 +339,12 @@ void KMMainWin::slotEmptyFolder()
     mFolder->open();
     mHeaders->setFolder(NULL);
     mMsgView->clear();
-    while ((msg = mFolder->take(0)) != NULL)
-      trashFolder->addMsg(msg);
 
+    if (mFolder != trashFolder)
+    {
+      while ((msg = mFolder->take(0)) != NULL)
+	trashFolder->addMsg(msg);
+    }
     mFolder->close();
     mFolder->expunge();
     mHeaders->setFolder(mFolder);
diff --git a/kmversion.h b/kmversion.h
index f26616a82..d93903a0f 100644
--- a/kmversion.h
+++ b/kmversion.h
@@ -3,6 +3,6 @@
 #ifndef kmversion_h
 #define kmversion_h
 
-#define KMAIL_VERSION "0.6.5"
+#define KMAIL_VERSION "0.6.6"
 
 #endif /*kmversion_h*/