equal
deleted
inserted
replaced
294 } |
294 } |
295 } |
295 } |
296 |
296 |
297 else |
297 else |
298 { |
298 { |
299 if ( securityMode ) |
299 if ( securityMode && callIsAlerting ) |
300 { |
300 { |
301 incomingCbaResourceId = EPhoneCallHandlingIncomingRejectCBA; |
301 incomingCbaResourceId = GetIncomingCallSilenceCBA( softRejectActivated ); |
302 } |
302 } |
|
303 else if ( securityMode ) |
|
304 { |
|
305 incomingCbaResourceId = EPhoneCallHandlingIncomingRejectCBA; |
|
306 } |
303 else if ( callIsAlerting ) |
307 else if ( callIsAlerting ) |
304 { |
308 { |
305 incomingCbaResourceId = GetIncomingCallSilenceCBA( softRejectActivated ); |
309 incomingCbaResourceId = GetIncomingCallSilenceCBA( softRejectActivated ); |
306 } |
310 } |
307 else if ( softRejectActivated ) |
311 else if ( softRejectActivated ) |
459 TPhoneCmdParamInteger touchpaneButtonsParam; |
463 TPhoneCmdParamInteger touchpaneButtonsParam; |
460 touchpaneButtonsParam.SetInteger( CPhoneMainResourceResolver::Instance()-> |
464 touchpaneButtonsParam.SetInteger( CPhoneMainResourceResolver::Instance()-> |
461 ResolveResourceID( EPhoneIncomingCallButtons ) ); |
465 ResolveResourceID( EPhoneIncomingCallButtons ) ); |
462 |
466 |
463 if ( iStateMachine.SecurityMode()->IsSecurityMode() ) |
467 if ( iStateMachine.SecurityMode()->IsSecurityMode() ) |
464 { |
468 { |
465 ret = EPhoneCallHandlingIncomingRejectCBA; |
469 ret = EPhoneCallHandlingIncomingCBA; |
466 } |
470 } |
467 else if ( touchpaneButtonsParam.Integer() |
471 else if ( touchpaneButtonsParam.Integer() |
468 == R_PHONEUI_INCOMING_CALL_SILENCE_BUTTONS ) |
472 == R_PHONEUI_INCOMING_CALL_SILENCE_BUTTONS ) |
469 { |
473 { |
470 aSoftRejectActivated ? |
474 aSoftRejectActivated ? |
471 ret = EPhoneCallHandlingIncomingSoftRejectCBA: |
475 ret = EPhoneCallHandlingIncomingSoftRejectCBA: |