diff -r 17302fa075e1 -r da6ac9d688df email/imap4mtm/imapprotocolcontroller/src/cimapprotocolcontroller.cpp --- a/email/imap4mtm/imapprotocolcontroller/src/cimapprotocolcontroller.cpp Wed Sep 15 12:08:45 2010 +0300 +++ b/email/imap4mtm/imapprotocolcontroller/src/cimapprotocolcontroller.cpp Wed Oct 13 14:27:34 2010 +0300 @@ -3510,49 +3510,17 @@ __LOG_TEXT(KDefaultLog, "CImapProtocolController::UpdateFlagL()"); __ASSERT_DEBUG(iImapCompound==NULL, TImapServerPanic::ImapPanic(TImapServerPanic::ECreateCompoundIsNotNull)); ResetProgress(); + if (!CompleteIfBackgroundOpInProgress(aStatus)) + { + iImapCompound = CImapUpdateFlagOperation::NewL(*iImapSyncManager, + iEntry, + *iImapSettings + ); + iRequestedOp = EUpdateFlag; + StartPrimaryOperation(); + Queue(aStatus); + SetActive(); + } + } - if (!CompleteIfBackgroundOpInProgress(aStatus)) - { - - iImapCompound = CImapUpdateFlagOperation::NewL(*iImapSyncManager, - iEntry, - *iImapSettings - ); - - iRequestedOp = EUpdateFlag; - StartPrimaryOperation(); - Queue(aStatus); - SetActive(); - } - - } - - - -/** -Updates the selection of messages read/unread status from the remote server. -@param aStatus -*/ -EXPORT_C void CImapProtocolController::UpdateEntriesFlagL( TRequestStatus& aStatus,const CMsvEntrySelection& aSourceSel ,TBool aFlagChanged) - - { - __LOG_TEXT(KDefaultLog, "CImapProtocolController::UpdateEntriesFlagL()"); - __ASSERT_DEBUG(iImapCompound==NULL, TImapServerPanic::ImapPanic(TImapServerPanic::ECreateCompoundIsNotNull)); - ResetProgress(); - - if (!CompleteIfBackgroundOpInProgress(aStatus)) - { - - iImapCompound = CImapUpdateFlagOperation::NewL(*iImapSyncManager, - iEntry, - *iImapSettings, - aSourceSel, - aFlagChanged); - iRequestedOp = EUpdateFlag; - StartPrimaryOperation(); - Queue(aStatus); - SetActive(); - } - - } - +