equal
deleted
inserted
replaced
128 { |
128 { |
129 // Number entry is behind waiting call bubble |
129 // Number entry is behind waiting call bubble |
130 // We can't answer to waiting call in this state |
130 // We can't answer to waiting call in this state |
131 // so display Not allowed -note. |
131 // so display Not allowed -note. |
132 CPhoneState::SendGlobalErrorNoteL( |
132 CPhoneState::SendGlobalErrorNoteL( |
133 EPhoneNoteTextNotAllowed ); |
133 EPhoneNoteTextNotAllowed, ETrue ); |
134 } |
134 } |
135 break; |
135 break; |
136 |
136 |
137 // end-key |
137 // end-key |
138 case EKeyNo: |
138 case EKeyNo: |
209 HandleIdleL( aCallId ); |
209 HandleIdleL( aCallId ); |
210 break; |
210 break; |
211 |
211 |
212 case MEngineMonitor::EPEMessageRemoteBusy: |
212 case MEngineMonitor::EPEMessageRemoteBusy: |
213 // If call setup failed then stop capturing keys. |
213 // If call setup failed then stop capturing keys. |
214 // Flow through to default branch. |
214 CaptureKeysDuringCallNotificationL( EFalse ); |
215 CaptureKeysDuringCallNotificationL( EFalse ); |
215 CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId ); |
|
216 break; |
216 default: |
217 default: |
217 CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId ); |
218 CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId ); |
218 break; |
219 break; |
219 } |
220 } |
220 } |
221 } |
447 if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() ) |
448 if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() ) |
448 { |
449 { |
449 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); |
450 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); |
450 } |
451 } |
451 |
452 |
452 HandleColpNoteL( aCallId ); |
|
453 |
|
454 if ( aCallId != iWaitingCallId ) |
453 if ( aCallId != iWaitingCallId ) |
455 { |
454 { |
456 // Alerting call is connected |
455 // Alerting call is connected |
457 StateChangeToTwoSinglesAndWaitingL( aCallId ); |
456 StateChangeToTwoSinglesAndWaitingL( aCallId ); |
458 } |
457 } |