From kde-commits  Thu Oct 28 17:45:31 2004
From: Carsten Burghardt <burghardt () kde ! org>
Date: Thu, 28 Oct 2004 17:45:31 +0000
To: kde-commits
Subject: kdepim/kmail
Message-Id: <20041028174531.A96DA16C87 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109898554025226

CVS commit by burghard: 

Hopefully fix Tills imap search crashes


  M +2 -15     kmfoldersearch.cpp   1.62
  M +0 -2      kmfoldersearch.h   1.29


--- kdepim/kmail/kmfoldersearch.cpp  #1.61:1.62
@@ -914,6 +914,5 @@ void KMFolderSearch::examineAddedMessage
     assert(folder && (idx != -1));
     assert(folder == aFolder);
-    if (!folder->isOpened())
-      return;
+    folder->open();
 
     connect( folder->storage(), 
@@ -931,4 +930,5 @@ void KMFolderSearch::slotSearchExamineMs
             this,
             SLOT( slotSearchExamineMsgDone( KMFolder*, QValueList<Q_UINT32> ) ) );
+    folder->close();
 
     if ( serNums.empty() )
@@ -947,17 +947,4 @@ void KMFolderSearch::slotSearchExamineMs
 }
 
-void KMFolderSearch::examineCompletedFolder(KMFolderImap *aFolder, bool success)
-{
-    disconnect (aFolder, SIGNAL(folderComplete(KMFolderImap*, bool)),
-                this, SLOT(examineCompletedFolder(KMFolderImap*, bool)));
-    if (!success) return;
-    Q_UINT32 serNum;
-    while (!mUnexaminedMessages.isEmpty()) {
-        serNum = mUnexaminedMessages.pop();
-        if (search()->searchPattern()->matches(serNum))
-            addSerNum(serNum);
-    }
-}
-
 void KMFolderSearch::examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum)
 {

--- kdepim/kmail/kmfoldersearch.h  #1.28:1.29
@@ -118,6 +118,4 @@ protected slots:
   // Look at a new message and if it matches search() add it to the cache
   void examineAddedMessage(KMFolder *folder, Q_UINT32 serNum);
-  // Look at all new messages in a completed (imap) folder
-  void examineCompletedFolder(KMFolderImap *folder, bool success);
   // Look at a removed message and remove it from the cache
   void examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum);