--- a/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp Tue Apr 27 16:37:10 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp Tue May 11 16:13:03 2010 +0300
@@ -296,10 +296,14 @@
else
{
- if ( securityMode )
- {
- incomingCbaResourceId = EPhoneCallHandlingIncomingRejectCBA;
- }
+ if ( securityMode && callIsAlerting )
+ {
+ incomingCbaResourceId = GetIncomingCallSilenceCBA( softRejectActivated );
+ }
+ else if ( securityMode )
+ {
+ incomingCbaResourceId = EPhoneCallHandlingIncomingRejectCBA;
+ }
else if ( callIsAlerting )
{
incomingCbaResourceId = GetIncomingCallSilenceCBA( softRejectActivated );
@@ -461,9 +465,9 @@
ResolveResourceID( EPhoneIncomingCallButtons ) );
if ( iStateMachine.SecurityMode()->IsSecurityMode() )
- {
- ret = EPhoneCallHandlingIncomingRejectCBA;
- }
+ {
+ ret = EPhoneCallHandlingIncomingCBA;
+ }
else if ( touchpaneButtonsParam.Integer()
== R_PHONEUI_INCOMING_CALL_SILENCE_BUTTONS )
{