diff -r 5f000ab63145 -r 838b0a10d15b phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Mon Jan 18 20:18:27 2010 +0200 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Tue Jan 26 11:57:27 2010 +0200 @@ -112,25 +112,41 @@ switch ( aMessage ) { case MEngineMonitor::EPEMessageConnecting: + { iAlerting = ETrue; HandleConnectingL( aCallId ); + } break; case MEngineMonitor::EPEMessageConnected: + { HandleConnectedL( aCallId ); + } break; case MEngineMonitor::EPEMessageConferenceIdle: + { HandleConferenceIdleL(); + } break; case MEngineMonitor::EPEMessageIdle: + { HandleIdleL( aCallId ); + } break; + + case MEngineMonitor::EPEMessageColpNumberAvailable: + { + HandleColpNoteL( aCallId ); + } + break; default: + { CPhoneConference::HandlePhoneEngineMessageL( aMessage, aCallId ); + } break; } } @@ -321,8 +337,6 @@ { iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); } - - HandleColpNoteL( aCallId ); SetTouchPaneButtons( EPhoneWaitingCallButtons ); SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );