diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -265,7 +265,7 @@ void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId ) { __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); if ( IsConferenceBubbleInSelectionMode() ) @@ -291,7 +291,7 @@ SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // CBA updates in above if-else conditions iStateMachine->ChangeState( EPhoneStateConferenceAndSingle ); } @@ -316,7 +316,7 @@ if( iRingingCallId == aCallId ) { - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); @@ -351,7 +351,7 @@ { SetTouchPaneButtons( EPhoneConferenceButtons ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // CBA updates in above if-else conditions iStateMachine->ChangeState( EPhoneStateConference ); } @@ -376,7 +376,7 @@ void CPhoneConferenceAndWaiting::HandleConferenceIdleL() { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConferenceIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); TPhoneCmdParamInteger activeCallCount; @@ -449,7 +449,7 @@ // come earlier than idle for conference member break; } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -494,7 +494,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleWentOneToOneL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update conference bubble iViewCommandHandle->ExecuteCommandL( @@ -523,7 +523,7 @@ // Go to Conference And Single And Waiting state iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // End of File