[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kroupware_branch: kdenetwork/kmail
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2003-03-13 10:52:37
[Download RAW message or body]

CVS commit by thorsen: 

Fix a crash that was there for almost all slave problems


  M +1 -9      kmacctcachedimap.cpp   1.1.2.50
  M +7 -8      kmfoldercachedimap.cpp   1.1.2.69


--- kdenetwork/kmail/kmacctcachedimap.cpp  #1.1.2.49:1.1.2.50
@@ -125,14 +125,6 @@ void KMAcctCachedImap::slotSlaveError(KI
   if (errorCode == KIO::ERR_SLAVE_DIED) slaveDied();
   if (errorCode == KIO::ERR_COULD_NOT_LOGIN && !mStorePasswd) mAskAgain = TRUE;
-#if 0
-  if (errorCode == KIO::ERR_DOES_NOT_EXIST)
-  {
-    // folder is gone, so reload the folderlist
-    if (mFolder) mFolder->listDirectory();
-    return;
-  }
-#endif
+
   // check if we still display an error
-  killAllJobs();
   if ( !mErrorDialogIsActive )
   {

--- kdenetwork/kmail/kmfoldercachedimap.cpp  #1.1.2.68:1.1.2.69
@@ -830,4 +830,6 @@ void KMFolderCachedImap::slotGetMessages
 void KMFolderCachedImap::getMessagesResult(KIO::Job * job, bool lastSet)
 {
+  if (lastSet) quiet( false );
+
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -836,17 +838,14 @@ void KMFolderCachedImap::getMessagesResu
     return;
   }
-  if (job->error())
-  {
-    mAccount->slotSlaveError( mAccount->slave(), job->error(),
-        job->errorText() );
+
+  if( job->error() ) {
+    mAccount->slotSlaveError( mAccount->slave(), job->error(), job->errorText() );
     mContentState = imapNoInformation;
     emit folderComplete(this, FALSE);
   } else if (lastSet) mContentState = imapFinished;
-  if (lastSet) quiet(FALSE);
+
   mAccount->removeJob(it);
-  if (!job->error() && lastSet) {
+  if( lastSet )
     emit listMessagesComplete();
-    //emit folderComplete(this, TRUE);
-  }
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]