diff -r 5266b1f337bd -r 8baf28733c3d phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Wed Sep 01 12:30:10 2010 +0100 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Tue Sep 14 21:18:17 2010 +0300 @@ -248,7 +248,7 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectingL()"); - BeginUiUpdateLC(); + TransitionHandlerL().BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); @@ -282,7 +282,7 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, &callHeaderParam ); - EndUiUpdate(); + TransitionHandlerL().EndUiUpdate(); } // ----------------------------------------------------------- @@ -296,7 +296,7 @@ // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - BeginUiUpdateLC(); + TransitionHandlerL().BeginUiUpdateLC(); // Show bubble TPhoneCmdParamCallHeaderData callHeaderParam; @@ -316,7 +316,7 @@ SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); - EndUiUpdate(); + TransitionHandlerL().EndUiUpdate(); UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA ); @@ -381,8 +381,8 @@ else { // Remove outgoing call - BeginTransEffectLC( ENumberEntryOpen ); - BeginUiUpdateLC(); + TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen ); + TransitionHandlerL().BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); CheckIfRestoreNEContentAfterDtmfDialer(); if ( IsNumberEntryUsedL() ) @@ -392,8 +392,7 @@ } SetTouchPaneButtons( EPhoneConferenceButtons ); - EndUiUpdate(); - EndTransEffect(); + TransitionHandlerL().EndUiUpdateAndEffect(); UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateConference ); }