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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/kmail
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-09-11 15:53:42
Message-ID: 1189526022.623230.28862.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 711165 by mueller:

reapply kmkernel checks


 M  +2 -2      popaccount.cpp  


--- branches/kdepim/enterprise/kdepim/kmail/popaccount.cpp #711164:711165
@@ -788,7 +788,7 @@
     mSlave = 0;
     stage = Idle;
     if( mMailCheckProgressItem ) { // do this only once...
-      bool canceled = kmkernel->mailCheckAborted() || \
mMailCheckProgressItem->canceled(); +      bool canceled = !kmkernel || \
kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled();  int numMessages \
= canceled ? indexOfCurrentMsg : idsOfMsgs.count();  \
                BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
         this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, \
mLeaveOnServer, mMailCheckProgressItem ); @@ -1015,7 +1015,7 @@
     mSlave = 0;
   }
 
-  if (interactive) {
+  if (interactive && kmkernel) {
     KMessageBox::error(kmkernel->mainWin(), KIO::buildErrorString(error, errorMsg));
   }
 


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