From 1f2a0cbd0411ace149bc0d2582f87ddad2ab9873 Mon Sep 17 00:00:00 2001
From: Allen Winter <winter@kde.org>
Date: Sun, 12 Jul 2009 21:52:23 +0000
Subject: [PATCH] restore fix for bug 130938 "kmail stops checking local
 mailbox" thanks simon.

BUG: 199918

svn path=/trunk/KDE/kdepim/; revision=995517
---
 kmacctlocal.cpp | 8 +-------
 kmacctlocal.h   | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/kmacctlocal.cpp b/kmacctlocal.cpp
index a52ead5b7..ef28eee5d 100644
--- a/kmacctlocal.cpp
+++ b/kmacctlocal.cpp
@@ -26,7 +26,7 @@ using KPIM::ProgressManager;
 //-----------------------------------------------------------------------------
 KMAcctLocal::KMAcctLocal(AccountManager* aOwner, const QString& aAccountName, uint id):
   KMAccount(aOwner, aAccountName, id), mHasNewMail( false ),
-  mProcessingNewMail( false ), mAddedOk( true ), mNumMsgs( 0 ),
+  mAddedOk( true ), mNumMsgs( 0 ),
   mMsgsFetched( 0 ), mMailFolder( 0 )
 {
   mLock = procmail_lockfile;
@@ -61,14 +61,9 @@ void KMAcctLocal::pseudoAssign( const KMAccount * a )
 //-----------------------------------------------------------------------------
 void KMAcctLocal::processNewMail(bool)
 {
-  if ( mProcessingNewMail )
-    return;
-
   mHasNewMail = false;
-  mProcessingNewMail = true;
 
   if ( !preProcess() ) {
-    mProcessingNewMail = false;
     return;
   }
 
@@ -87,7 +82,6 @@ void KMAcctLocal::processNewMail(bool)
   }
 
   postProcess();
-  mProcessingNewMail = false;
 }
 
 
diff --git a/kmacctlocal.h b/kmacctlocal.h
index 64545ee90..8ce8a8160 100644
--- a/kmacctlocal.h
+++ b/kmacctlocal.h
@@ -45,7 +45,6 @@ private:
   QString mLocation;
   QString mProcmailLockFileName;
   bool mHasNewMail;
-  bool mProcessingNewMail;
   bool mAddedOk;
   LockType mLock;
   int mNumMsgs;