diff -r d1c62c765e48 -r cfea66083b62 phoneapp/phoneuicontrol/src/cphonestateincoming.cpp --- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Fri Sep 17 17:09:12 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Mon Oct 04 16:06:10 2010 +0300 @@ -258,7 +258,6 @@ break; case MEngineMonitor::EPEMessageDisconnecting: - iCallDisconnected = ETrue; CPhoneState::HandlePhoneEngineMessageL( aMessage, aCallId ); break; @@ -292,10 +291,7 @@ break; case MEngineMonitor::EPEMessageRemotePartyInfoChanged: - if(!iCallDisconnected) - { - UpdateRemoteInfoDataAndLabelL( aCallId ); - } + UpdateCallHeader( aCallId ); break; default: @@ -305,20 +301,6 @@ } // ----------------------------------------------------------- -// CPhoneStateIncoming::UpdateRemoteInfoDataAndLabelL -// ----------------------------------------------------------- -// -void CPhoneStateIncoming::UpdateRemoteInfoDataAndLabelL( - TInt aCallId ) - { - __LOGMETHODSTARTEND(EPhoneControl, - "CPhoneStateIncoming::UpdateRemoteInfoDataAndLabelL ()" ); - iViewCommandHandle->ExecuteCommandL( - EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel, - aCallId ); - } - -// ----------------------------------------------------------- // CPhoneStateIncoming::HandleConnectedL // ----------------------------------------------------------- // @@ -330,8 +312,6 @@ globalNotifierParam.SetBoolean( EFalse ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, &globalNotifierParam ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone ); @@ -369,11 +349,6 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone ); - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( - EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); SetDefaultFlagsL(); if ( !iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue ) ) @@ -499,8 +474,6 @@ iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageRelease ); } ShowDisconnectingL( iRingingCallId ); - - iCallDisconnected = ETrue; } // ----------------------------------------------------------- @@ -517,12 +490,6 @@ iUiCommandManager->SetSoftRejectStatus( EFalse ); - // Re-enable global notes. Otherwise message editor is not opened. - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); - UpdateUiCommands(); TPhoneCmdParamSfiData sfiDataParam;