diff -r ecc8def7944a -r 2dc6caa42ec3 emailuis/nmframeworkadapter/src/nmfwamessagefetchingoperation.cpp --- a/emailuis/nmframeworkadapter/src/nmfwamessagefetchingoperation.cpp Mon May 03 12:23:15 2010 +0300 +++ b/emailuis/nmframeworkadapter/src/nmfwamessagefetchingoperation.cpp Fri May 14 15:41:10 2010 +0300 @@ -15,17 +15,14 @@ * */ -#include "nmfwamessagefetchingoperation.h" #include "nmframeworkadapterheaders.h" NmFwaMessageFetchingOperation::NmFwaMessageFetchingOperation( const NmId &mailboxId, const NmId &folderId, const NmId &messageId, - CFSMailClient &mailClient, - QObject *parent) : - NmOperation(parent), - mMailboxId(mailboxId), + CFSMailClient &mailClient) + : mMailboxId(mailboxId), mFolderId(folderId), mMessageId(messageId), mMailClient(mailClient), @@ -37,6 +34,7 @@ NmFwaMessageFetchingOperation::~NmFwaMessageFetchingOperation() { doCancelOperation(); + NMLOG("NmFwaMessageFetchingOperation::~NmFwaMessageFetchingOperation --->"); } void NmFwaMessageFetchingOperation::doRunAsyncOperation() @@ -82,7 +80,7 @@ completeOperation(NmNoError); } else if (aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestCancelled) { - operationCancelled(); + completeOperation(NmCancelError); } } }