# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268401454 -7200 # Node ID 5e57de868bc0aa47b9aa2f07db329fe9c9d649ca # Parent 513a8b745b2f89c13eccd8ef7af83bfb07408960 Revision: 201006 Kit: 201008 diff -r 513a8b745b2f -r 5e57de868bc0 multimediacommscontroller/tsrc/stubs/src/ws_stubs.cpp --- a/multimediacommscontroller/tsrc/stubs/src/ws_stubs.cpp Fri Feb 19 23:12:20 2010 +0200 +++ b/multimediacommscontroller/tsrc/stubs/src/ws_stubs.cpp Fri Mar 12 15:44:14 2010 +0200 @@ -53,7 +53,16 @@ void CWindowGc::Deactivate() { - }/* + } +void CWindowGc::CancelClippingRect() + { + + } +void CWindowGc::DrawRect( const TRect &aRect ) + { + + } +/* TInt CWindowGc::APIExtension(TUid aUid, TAny*& aOutput, TAny* aInput) { diff -r 513a8b745b2f -r 5e57de868bc0 multimediacommsengine/mmcesrv/mmceserver/inc/mcesipsession.h --- a/multimediacommsengine/mmcesrv/mmceserver/inc/mcesipsession.h Fri Feb 19 23:12:20 2010 +0200 +++ b/multimediacommsengine/mmcesrv/mmceserver/inc/mcesipsession.h Fri Mar 12 15:44:14 2010 +0200 @@ -731,6 +731,7 @@ void ForceUpdateStreamL(); void ResetCurrentDialog(); + void SetFirstOffer(); protected: @@ -790,6 +791,7 @@ //SDP offer/answer CSdpDocument* iOffer; + CSdpDocument* iFirstOffer; // Force SDP Sending Flag used for Resrouce Reservation TBool iForceSDPSending; diff -r 513a8b745b2f -r 5e57de868bc0 multimediacommsengine/mmcesrv/mmceserver/src/mcesipsession.cpp --- a/multimediacommsengine/mmcesrv/mmceserver/src/mcesipsession.cpp Fri Feb 19 23:12:20 2010 +0200 +++ b/multimediacommsengine/mmcesrv/mmceserver/src/mcesipsession.cpp Fri Mar 12 15:44:14 2010 +0200 @@ -2635,6 +2635,8 @@ { ActiveBody().SdpSession().UpdateSecureStreamL( ActiveBody() ); Manager().MediaManager().UpDateStreamStateL( *iBody, ActiveBody() ); + __ASSERT_ALWAYS( iFirstOffer, User::Leave( KErrArgument ) ); + ActiveBody().SdpSession().iSdpDocument = iFirstOffer; } MCESRV_DEBUG("CMceSipSession::ForceUpdateStream, Exit"); } @@ -2649,4 +2651,13 @@ iCurrentDialog = iDialog; } } +void CMceSipSession::SetFirstOffer() + { + if( iBodyBucket.Count() == 0 ) + { + CSdpDocument* clonedOffer = NULL; + TRAP_IGNORE( ( clonedOffer = iOffer->CloneL() ) ); + iFirstOffer = clonedOffer; + } + } // End of File diff -r 513a8b745b2f -r 5e57de868bc0 multimediacommsengine/mmcesrv/mmceserver/src/mcestateconfirming.cpp --- a/multimediacommsengine/mmcesrv/mmceserver/src/mcestateconfirming.cpp Fri Feb 19 23:12:20 2010 +0200 +++ b/multimediacommsengine/mmcesrv/mmceserver/src/mcestateconfirming.cpp Fri Mar 12 15:44:14 2010 +0200 @@ -246,6 +246,7 @@ { session.ActiveBody().SecureSession()->iLSReadyToBind = ETrue; } + session.SetFirstOffer(); status = session.Actions().DecodeL(); if ( status == KMceSipPreconditionFailure ) {