equal
deleted
inserted
replaced
172 |
172 |
173 // ----------------------------------------------------------- |
173 // ----------------------------------------------------------- |
174 // CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL |
174 // CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL |
175 // ----------------------------------------------------------- |
175 // ----------------------------------------------------------- |
176 // |
176 // |
177 void CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL( TInt aCallId ) |
177 void CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL( TInt /*aCallId*/ ) |
178 { |
178 { |
179 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL"); |
179 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL"); |
180 iViewCommandHandle->ExecuteCommandL( EPhoneViewAddToConference ); |
180 iViewCommandHandle->ExecuteCommandL( EPhoneViewAddToConference ); |
181 UpdateConferenceSecurityStatusL( aCallId ); |
181 UpdateConferenceSecurityStatusL(); |
182 MakeStateTransitionToConferenceAndWaitingL( KConferenceCallId ); |
182 MakeStateTransitionToConferenceAndWaitingL( KConferenceCallId ); |
183 } |
183 } |
184 |
184 |
185 // ----------------------------------------------------------- |
185 // ----------------------------------------------------------- |
186 // CPhoneConferenceAndSingleAndWaiting::MakeStateTransitionToConferenceAndWaitingL |
186 // CPhoneConferenceAndSingleAndWaiting::MakeStateTransitionToConferenceAndWaitingL |
270 callStateData.SetCallState( EPEStateRinging ); |
270 callStateData.SetCallState( EPEStateRinging ); |
271 iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, |
271 iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, |
272 &callStateData ); |
272 &callStateData ); |
273 if ( callStateData.CallId() != KErrNotFound ) |
273 if ( callStateData.CallId() != KErrNotFound ) |
274 { |
274 { |
275 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, |
275 UpdateCallHeaderAndUiCommandsL( callStateData.CallId() ); |
276 callStateData.CallId() ); |
|
277 |
|
278 SetRingingTonePlaybackL( callStateData.CallId() ); |
276 SetRingingTonePlaybackL( callStateData.CallId() ); |
279 UpdateUiCommands(); |
|
280 SetBackButtonActive(EFalse); |
277 SetBackButtonActive(EFalse); |
281 iStateMachine->ChangeState( EPhoneStateIncoming ); |
278 iStateMachine->ChangeState( EPhoneStateIncoming ); |
282 } |
279 } |
283 else |
280 else |
284 { |
281 { |