--- a/ipsservices/ipssosplugin/src/ipsplgonlineoperation.cpp Mon May 03 12:23:15 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgonlineoperation.cpp Fri May 14 15:41:10 2010 +0300
@@ -35,6 +35,8 @@
// CIpsPlgOnlineOperation::CIpsPlgOnlineOperation()
// ----------------------------------------------------------------------------
// <qmail> priority parameter has been removed
+// <qmail> MFSMailRequestObserver& changed to pointer
+// <qmail> aSignallingAllowed parameter has been removed
CIpsPlgOnlineOperation::CIpsPlgOnlineOperation(
CMsvSession& aMsvSession,
TRequestStatus& aObserverRequestStatus,
@@ -48,7 +50,7 @@
aObserverRequestStatus,
aFSRequestId,
aFSMailBoxId ),
- iActivityTimer( aActivityTimer ),
+ iActivityTimer( &aActivityTimer ),
iBaseMtm( NULL ),
iMtmReg( NULL ),
iSubOperation( NULL ),
@@ -68,7 +70,10 @@
// reset timer, if operation not completed after timer fires causes
// disconnection
// <qmail> remove cheking of existence of this reference member
- iActivityTimer.ResetTimerOperation();
+ if (iActivityTimer)
+ {
+ iActivityTimer->ResetTimerOperation();
+ }
iMtmReg = CClientMtmRegistry::NewL( iMsvSession );
iBaseMtm = iMtmReg->NewMtmL( aMtmType );
@@ -129,11 +134,11 @@
//if connected, reset activitytimer. if not, there is no reason to.
if ( Connected() )
{
- iActivityTimer.ResetTimerOperation();
+ iActivityTimer->ResetTimerOperation();
}
else
{
- iActivityTimer.Cancel();
+ iActivityTimer->Cancel();
}
// </qmail>
User::RequestComplete(status, aStatus);