--- a/ipsservices/ipssosplugin/src/ipsplgdisconnectop.cpp Tue Feb 02 00:02:40 2010 +0200
+++ b/ipsservices/ipssosplugin/src/ipsplgdisconnectop.cpp Fri Apr 16 14:51:52 2010 +0300
@@ -123,17 +123,10 @@
return result;
}
-// ----------------------------------------------------------------------------
-// CIpsPlgDisconnectOp::Connected()
-// ----------------------------------------------------------------------------
-//
-TBool CIpsPlgDisconnectOp::Connected() const
- {
- FUNC_LOG;
- return iTEntry.Connected();
- }
+// <qmail> Connected() moved to base class
// ----------------------------------------------------------------------------
+
// CIpsPlgDisconnectOp::DoRunL()
// ----------------------------------------------------------------------------
//
@@ -149,18 +142,11 @@
{
if ( iDoRemoveAfterDisconnect )
{
- CIpsSetDataApi* settings = CIpsSetDataApi::NewL( iMsvSession );
- CleanupStack::PushL( settings );
- settings->RemoveAccountL( iTEntry, iMsvSession );
- CleanupStack::PopAndDestroy( settings );
-
- // delete the activitytimer here and set it to null so we don't try
- // to use it in CompleteObserver. This is a special case that
- // relates to deleting a connected mailbox.
- delete iActivityTimer;
- iActivityTimer = NULL;
+ //CIpsSetDataApi* settings = CIpsSetDataApi::NewL( iMsvSession );
+ //CleanupStack::PushL( settings );
+ //settings->RemoveAccountL( iTEntry, iMsvSession );
+ //CleanupStack::PopAndDestroy( settings );
}
-
CompleteObserver( KErrNone );
}
}