--- a/ipsservices/ipssosplugin/src/ipsplgonlineoperation.cpp Thu May 27 12:43:55 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgonlineoperation.cpp Fri Jun 11 13:27:14 2010 +0300
@@ -36,14 +36,15 @@
// ----------------------------------------------------------------------------
// <qmail> priority parameter has been removed
// <qmail> MFSMailRequestObserver& changed to pointer
-// <qmail> aSignallingAllowed parameter has been removed
+// <qmail> aSignallingAllowed parameter has been returned
CIpsPlgOnlineOperation::CIpsPlgOnlineOperation(
CMsvSession& aMsvSession,
TRequestStatus& aObserverRequestStatus,
CIpsPlgTimerOperation& aActivityTimer,
TFSMailMsgId aFSMailBoxId,
MFSMailRequestObserver* aFSOperationObserver,
- TInt aFSRequestId )
+ TInt aFSRequestId,
+ TBool aSignallingAllowed )
:
CIpsPlgBaseOperation(
aMsvSession,
@@ -55,6 +56,7 @@
iMtmReg( NULL ),
iSubOperation( NULL ),
iError( KErrNone ),
+ iSignallingAllowed( aSignallingAllowed ),
iFSOperationObserver( aFSOperationObserver )
{
FUNC_LOG;
@@ -216,7 +218,9 @@
{
FUNC_LOG;
// <qmail> clean up this function
- if( iFSOperationObserver )
+ // <qmail>
+ if( iSignallingAllowed )
+ // </qmail>
{
// Initialize the progress data
TFSProgress prog = { TFSProgress::EFSStatus_RequestComplete, 1, 1, aStatus, NULL };
@@ -226,9 +230,13 @@
{
prog.iProgressStatus = TFSProgress::EFSStatus_RequestCancelled;
}
-
- // do the actual signalling
- TRAP_IGNORE( iFSOperationObserver->RequestResponseL( prog, iFSRequestId ) );
+ // <qmail>
+ if( iFSOperationObserver )
+ {
+ // do the actual signalling
+ TRAP_IGNORE( iFSOperationObserver->RequestResponseL( prog, iFSRequestId ) );
+ }
+ // </qmail>
}
}