diff options
Diffstat (limited to 'kmail/kmacctmaildir.cpp')
-rw-r--r-- | kmail/kmacctmaildir.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index b3c5d31c7..ca3789207 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -9,7 +9,7 @@ #include "kmfoldermaildir.h" #include "kmacctfolder.h" #include "broadcaststatus.h" -using KPIM::BroadcastStatus; +using KPIM::BroadcasStatus; #include "progressmanager.h" using KPIM::ProgressManager; @@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool) TQFileInfo fi( location() ); if ( !fi.exists() ) { checkDone( hasNewMail, CheckOK ); - BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 ); + BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); return; } } @@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool) if (!mFolder) { checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); + BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return; } - BroadcastStatus::instance()->setStatusMsg( + BroadcasStatus::instance()->seStatusMsg( i18n("Preparing transmission from \"%1\"...").arg(mName)); Q_ASSERT( !mMailCheckProgressItem ); @@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool) { kdDebug(5006) << "cannot run precommand " << precommand() << endl; checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); + BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return; } @@ -134,7 +134,7 @@ void KMAcctMaildir::processNewMail(bool) KMessageBox::sorry(0, aStr); kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl; checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); + BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return; } @@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool) { if( kmkernel->mailCheckAborted() ) { - BroadcastStatus::instance()->setStatusMsg( i18n("Transmission aborted.") ); + BroadcasStatus::instance()->seStatusMsg( i18n("Transmission aborted.") ); num = i; addedOk = false; } @@ -165,12 +165,12 @@ void KMAcctMaildir::processNewMail(bool) TQString statusMsg = statusMsgStub.arg(i); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->setStatus( statusMsg ); + mMailCheckProgressItem->seStatus( statusMsg ); msg = mailFolder.take(0); if (msg) { - msg->setStatus(msg->headerField("Status").latin1(), + msg->seStatus(msg->headerField("Status").latin1(), msg->headerField("X-Status").latin1()); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0)); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); @@ -188,8 +188,8 @@ void KMAcctMaildir::processNewMail(bool) } if( mMailCheckProgressItem ) { // do this only once... - BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( num ); - mMailCheckProgressItem->setStatus( + BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( num ); + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from maildir folder %1.", "Fetched %n messages from maildir folder %1.", num ).arg(mailFolder.location() ) ); @@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool) } if (addedOk) { - BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, num ); + BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, num ); } // else warning is written already |