diff -r 9ba4404ef423 -r 759dc5235cdb emailuis/nmframeworkadapter/src/nmfwamessagepartfetchingoperation.cpp --- a/emailuis/nmframeworkadapter/src/nmfwamessagepartfetchingoperation.cpp Thu May 27 12:43:55 2010 +0300 +++ b/emailuis/nmframeworkadapter/src/nmfwamessagepartfetchingoperation.cpp Fri Jun 11 13:27:14 2010 +0300 @@ -35,7 +35,7 @@ mRequestId(0) { - + NM_FUNCTION; } /*! @@ -43,8 +43,9 @@ */ NmFwaMessagePartFetchingOperation::~NmFwaMessagePartFetchingOperation() { + NM_FUNCTION; + doCancelOperation(); - NMLOG("NmFwaMessagePartFetchingOperation::~NmFwaMessagePartFetchingOperation --->"); } /*! @@ -52,6 +53,8 @@ */ void NmFwaMessagePartFetchingOperation::RequestResponseL(TFSProgress aEvent, TInt aRequestId) { + NM_FUNCTION; + if (aRequestId == mRequestId) { if (aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestComplete ) { completeOperation(aEvent.iError); @@ -81,6 +84,8 @@ */ void NmFwaMessagePartFetchingOperation::doRunAsyncOperation() { + NM_FUNCTION; + TRAPD(err, doRunAsyncOperationL()); if (err != KErrNone) { completeOperation(NmGeneralError); @@ -92,6 +97,8 @@ */ void NmFwaMessagePartFetchingOperation::doRunAsyncOperationL() { + NM_FUNCTION; + const TFSMailMsgId mailboxId(mMailboxId.pluginId32(), mMailboxId.id32()); const TFSMailMsgId folderId(mFolderId.pluginId32(), mFolderId.id32()); const TFSMailMsgId messageId(mMessageId.pluginId32(), mMessageId.id32()); @@ -123,6 +130,8 @@ */ void NmFwaMessagePartFetchingOperation::doCompleteOperation() { + NM_FUNCTION; + mRequestId = NmNotFoundError; } @@ -131,6 +140,8 @@ */ void NmFwaMessagePartFetchingOperation::doCancelOperation() { + NM_FUNCTION; + if (mRequestId >= 0) { TRAP_IGNORE(mMailClient.CancelL(mRequestId)); mRequestId = NmNotFoundError;