--- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Mon Jan 18 20:18:27 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Tue Jan 26 11:57:27 2010 +0200
@@ -107,25 +107,41 @@
switch ( aMessage )
{
case MEngineMonitor::EPEMessageConnecting:
+ {
iAlerting = ETrue;
HandleConnectingL( aCallId );
+ }
break;
case MEngineMonitor::EPEMessageConnected:
+ {
HandleConnectedL( aCallId );
+ }
break;
case MEngineMonitor::EPEMessageIdle:
+ {
HandleIdleL( aCallId );
+ }
break;
case MEngineMonitor::EPEMessageConferenceIdle:
+ {
HandleConferenceIdleL();
+ }
break;
+ case MEngineMonitor::EPEMessageColpNumberAvailable:
+ {
+ HandleColpNoteL( aCallId );
+ }
+ break;
+
default:
+ {
CPhoneConference::HandlePhoneEngineMessageL( aMessage,
aCallId );
+ }
break;
}
}
@@ -311,8 +327,7 @@
SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
EndUiUpdate();
-
- HandleColpNoteL( aCallId );
+
UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA );
iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );