diff -r de84881f4ac3 -r 52d91a16fec3 simpledatamodeladapter/src/presencepluginconnection.cpp --- a/simpledatamodeladapter/src/presencepluginconnection.cpp Tue Apr 27 17:03:39 2010 +0300 +++ b/simpledatamodeladapter/src/presencepluginconnection.cpp Tue May 11 16:35:18 2010 +0300 @@ -108,7 +108,7 @@ const TDesC8& aETag ) { DP_SDA("CPresencePluginConnection::ConstructL loaded"); - + iETag = aETag.AllocL(); iSession = CPresencePluginSession::NewL( aServiceInfo, *this ); @@ -196,6 +196,8 @@ { DP_SDA("CPresencePluginConnection::~CPresencePluginConnection"); + Cancel(); + delete iSipPresentity; iSipPresentity = NULL; @@ -876,16 +878,17 @@ } // --------------------------------------------------------------------------- -// CPresencePluginPublisher::DoCancel() +// CPresencePluginConnection::DoCancel() // --------------------------------------------------------------------------- // void CPresencePluginConnection::DoCancel( ) { DP_SDA("CPresencePluginConnection::DoCancel CANCEL"); + iPublisher->Cancel(); } // --------------------------------------------------------------------------- -// CPresencePluginSession::RunL() +// CPresencePluginConnection::RunL() // --------------------------------------------------------------------------- // void CPresencePluginConnection::RunL( ) @@ -910,7 +913,7 @@ } // --------------------------------------------------------------------------- -// CPresencePluginSession::RunError +// CPresencePluginConnection::RunError // --------------------------------------------------------------------------- // TInt CPresencePluginConnection::RunError( TInt /*aError*/ )