Revision: 201006 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 12 Mar 2010 15:44:14 +0200
branchRCL_3
changeset 7 5e57de868bc0
parent 3 513a8b745b2f
child 8 f9c1f5f9ce0b
Revision: 201006 Kit: 201008
multimediacommscontroller/tsrc/stubs/src/ws_stubs.cpp
multimediacommsengine/mmcesrv/mmceserver/inc/mcesipsession.h
multimediacommsengine/mmcesrv/mmceserver/src/mcesipsession.cpp
multimediacommsengine/mmcesrv/mmceserver/src/mcestateconfirming.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)
     {
     
--- 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;
--- 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
--- 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 )
                 	{