diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -248,17 +248,14 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectingL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -282,7 +279,7 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, &callHeaderParam ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -296,7 +293,7 @@ // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Show bubble TPhoneCmdParamCallHeaderData callHeaderParam; @@ -316,7 +313,7 @@ SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA ); @@ -332,10 +329,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndCallSetup::HandleIdleL()"); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -381,8 +375,8 @@ else { // Remove outgoing call - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginTransEffectLC( ENumberEntryOpen ); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); CheckIfRestoreNEContentAfterDtmfDialer(); if ( IsNumberEntryUsedL() ) @@ -392,7 +386,8 @@ } SetTouchPaneButtons( EPhoneConferenceButtons ); - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateConference ); }