simpleengine/siputils/src/simplesipconnectionobserver.cpp
branchRCL_3
changeset 34 2669f8761a99
parent 0 c8caa15ef882
child 35 fbd2e7cec7ef
--- a/simpleengine/siputils/src/simplesipconnectionobserver.cpp	Thu Aug 19 10:19:02 2010 +0300
+++ b/simpleengine/siputils/src/simplesipconnectionobserver.cpp	Tue Aug 31 15:35:50 2010 +0300
@@ -160,18 +160,6 @@
     }     
     
 // -----------------------------------------------------------------------------
-// CSimpleSipConnectionObserver::ProfileUpdated
-// -----------------------------------------------------------------------------
-//
-void CSimpleSipConnectionObserver::ProfileUpdated()
-    {
-#ifdef _DEBUG
-    TSimpleLogger::Log(_L("SipConnectionObserver: ProfileUpdated"));
-#endif
-    iCallback.ConnectionChanged();
-    }
-
-// -----------------------------------------------------------------------------
 // CSimpleSipConnectionObserver::ConnectionStateChanged2
 // -----------------------------------------------------------------------------
 //
@@ -580,15 +568,13 @@
             Extract( EUriUserinfo );
         const TDesC8& host = fromHeader->SIPAddress().Uri8().Uri().
             Extract( EUriHost );
-        
-        CleanupStack::PushL( aTransaction ); // CS: 1
-        
         HBufC8* from = HBufC8::NewLC( user.Length() + KAt().Length() +
             host.Length() ); // CS: 1
         from->Des().Copy( user );
         from->Des().Append( KAt() );
         from->Des().Append( host );
         
+        CleanupStack::PushL( aTransaction ); // CS: 2
         CSIPResponseElements* respElem = CSIPResponseElements::NewLC( // CS: 3
             KSimpleOK, SIPStrings::StringF( SipStrConsts::EPhraseOk ) );
         
@@ -596,10 +582,10 @@
         aTransaction->SendResponseL( respElem );
         
         CleanupStack::Pop( respElem );     // CS: 2
-
+        CleanupStack::Pop( aTransaction ); // CS: 1
+        
         iCallback.HandleReceivedMessage( *from, content );
-        CleanupStack::PopAndDestroy( from ); // CS: 1
-        CleanupStack::Pop( aTransaction ); // CS: 0
+        CleanupStack::PopAndDestroy( from ); // CS: 0
         }
     
     // We no longer need aTransaction. Just delete it.