--- a/ipsservices/ipssosplugin/src/ipsplgconnectandrefreshfolderlist.cpp Fri Mar 12 15:41:14 2010 +0200
+++ b/ipsservices/ipssosplugin/src/ipsplgconnectandrefreshfolderlist.cpp Mon Mar 15 12:39:10 2010 +0200
@@ -75,15 +75,11 @@
0, // FSRequestId
EFalse), // SignallingAllowed
iState( EIdle ),
- iMailboxId( aMailboxId ),
- iSession( aSession ),
- iService( aService ),
- iOperation( NULL ),
iTimer( NULL ),
- iMsvEntry( NULL ),
- iObserverRequestStatus( aObserverRequestStatus )
+ iMsvEntry( NULL )
{
FUNC_LOG;
+ iService = aService;
}
// ----------------------------------------------------------------------------
@@ -96,7 +92,6 @@
iMsvEntry = aMsvEntry.CopyL();
iState = EStartConnect;
DoRunL();
-
}
// ----------------------------------------------------------------------------
@@ -106,7 +101,6 @@
FUNC_LOG;
Cancel();
delete iMsvEntry;
- delete iOperation;
}
// ---------------------------------------------------------------------------
@@ -224,11 +218,11 @@
delete iOperation;
iOperation = NULL;
iOperation = CIpsPlgDisconnectOp::NewL(
- iSession,
+ iMsvSession,
iStatus,
iService,
*iTimer,
- iMailboxId,
+ iFSMailboxId,
*observer,
NULL );
iState = EDisconnecting;
@@ -268,7 +262,7 @@
// Get the TMsvEntry for the mailbox, which we use to get its name.
TMsvId serviceId;
TMsvEntry mailboxServiceEntry;
- User::LeaveIfError( iSession.GetEntry( iMailboxId.Id(), serviceId, mailboxServiceEntry ) );
+ User::LeaveIfError( iMsvSession.GetEntry( iFSMailboxId.Id(), serviceId, mailboxServiceEntry ) );
// Load/construct the strings for the dialog.
HBufC* headerText( NULL );