diff options
Diffstat (limited to 'kmail/kmacctlocal.cpp')
-rw-r--r-- | kmail/kmacctlocal.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index d1e15f83a..47e04f33b 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -8,7 +8,7 @@ #include "kmfoldermbox.h" #include "kmacctfolder.h" #include "broadcaststatus.h" -using KPIM::BroadcastStatus; +using KPIM::BroadcasStatus; #include "progressmanager.h" using KPIM::ProgressManager; @@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess() if ( precommand().isEmpty() ) { TQFileInfo fi( location() ); if ( fi.size() == 0 ) { - BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 ); + BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); checkDone( mHasNewMail, CheckOK ); return false; } @@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess() if (!mFolder) { checkDone( mHasNewMail, CheckError ); - BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); + BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return false; } - //BroadcastStatus::instance()->reset(); - BroadcastStatus::instance()->setStatusMsg( + //BroadcasStatus::instance()->reset(); + BroadcasStatus::instance()->seStatusMsg( i18n("Preparing transmission from \"%1\"...").arg(mName)); @@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess() { kdDebug(5006) << "cannot run precommand " << precommand() << endl; checkDone( mHasNewMail, CheckError ); - BroadcastStatus::instance()->setStatusMsg( i18n( "Running precommand failed." )); + BroadcasStatus::instance()->seStatusMsg( i18n( "Running precommand failed." )); return false; } @@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess() kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/" << mMailFolder->name() << endl; checkDone( mHasNewMail, CheckError ); - BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); + BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return false; } @@ -165,7 +165,7 @@ bool KMAcctLocal::preProcess() checkDone( mHasNewMail, CheckError ); TQString errMsg = i18n( "Transmission failed: Could not lock %1." ) .arg( mMailFolder->location() ); - BroadcastStatus::instance()->setStatusMsg( errMsg ); + BroadcasStatus::instance()->seStatusMsg( errMsg ); return false; } @@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess() mStatusMsgStub = i18n("Moving message %3 of %2 from %1.") .arg(mMailFolder->location()).arg( mNumMsgs ); - //BroadcastStatus::instance()->setStatusProgressEnable( "L" + mName, true ); + //BroadcasStatus::instance()->seStatusProgressEnable( "L" + mName, true ); return true; } @@ -193,10 +193,10 @@ bool KMAcctLocal::fetchMsg() if (kmkernel->mailCheckAborted()) break; */ const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched ); - //BroadcastStatus::instance()->setStatusMsg( statusMsg ); + //BroadcasStatus::instance()->seStatusMsg( statusMsg ); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->setStatus( statusMsg ); + mMailCheckProgressItem->seStatus( statusMsg ); msg = mMailFolder->take(0); if (msg) @@ -214,7 +214,7 @@ bool KMAcctLocal::fetchMsg() fileD0.close(); // If data is 0 we just create a zero length file. } #endif - 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)); @@ -249,8 +249,8 @@ void KMAcctLocal::postProcess() } if( mMailCheckProgressItem ) { // do this only once... - BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, mNumMsgs ); - mMailCheckProgressItem->setStatus( + BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs ); + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from mailbox %1.", "Fetched %n messages from mailbox %1.", mNumMsgs ).arg( mMailFolder->location() ) ); |