diff -r c84cf270c54f -r 92ab7f8d0eab phoneapp/phoneuistates/src/cphonesingleandalerting.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Tue Feb 02 00:10:04 2010 +0200 +++ b/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Fri Mar 19 09:28:42 2010 +0200 @@ -102,26 +102,15 @@ switch ( aMessage ) { case MEngineMonitor::EPEMessageConnected: - { HandleConnectedL( aCallId ); break; - } - case MEngineMonitor::EPEMessageIdle: - { - HandleIdleL( aCallId ); - } - break; - case MEngineMonitor::EPEMessageColpNumberAvailable: - { - HandleColpNoteL( aCallId ); - } - break; + case MEngineMonitor::EPEMessageIdle: + HandleIdleL( aCallId ); + break; default: - { CPhoneAlerting::HandlePhoneEngineMessageL( aMessage, aCallId ); - } break; } } @@ -226,7 +215,7 @@ // Set Two singles softkeys - UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); + UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); // Go to two singles state iStateMachine->ChangeState( EPhoneStateTwoSingles ); @@ -242,7 +231,9 @@ TPhoneCmdParamBoolean holdFlag; holdFlag.SetBoolean( EFalse ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag ); - } + } + + CPhoneGsmInCall::HandleColpNoteL( aCallId ); } // ----------------------------------------------------------- // CPhoneSingleAndAlerting::HandleIdleL @@ -327,7 +318,7 @@ void CPhoneSingleAndAlerting::UpdateInCallCbaL() { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneSingleAndAlerting::UpdateInCallCbaL() "); - UpdateCbaL( EPhoneCallHandlingInCallCBA ); + UpdateCbaL( EPhoneCallHandlingInCallCBA ); }