diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonecbamanager.cpp --- a/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp Fri Mar 19 09:28:42 2010 +0200 +++ b/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp Fri Apr 16 14:58:25 2010 +0300 @@ -22,9 +22,6 @@ #include "mphonestatemachine.h" #include -// <-- QT PHONE START --> -//#include -// <-- QT PHONE END --> #include "phonerssbase.h" #include "phoneui.pan" @@ -458,36 +455,7 @@ const TBool /*aSoftRejectActivated*/ ) { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneCbaManager::GetIncomingCallSilenceCBA ()" ); -// <-- QT PHONE START --> TInt ret = EPhoneCallHandlingIncomingCBA; - /*TInt ret = EPhoneCallHandlingIncomingSoftRejectCBA; - - //Get incoming call touchpane button set - TPhoneCmdParamInteger touchpaneButtonsParam; - touchpaneButtonsParam.SetInteger( CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( EPhoneIncomingCallButtons ) ); - - if ( touchpaneButtonsParam.Integer() - == R_PHONEUI_INCOMING_CALL_SILENCE_BUTTONS ) - { - aSoftRejectActivated ? - ret = EPhoneCallHandlingIncomingSoftRejectCBA: - ret = EPhoneCallHandlingIncomingRejectCBA; - } - else - { - // Check if the ringtone has been silenced. If it is, then show - // "Send Message" in RSK, else show "Silence". - iRingtoneSilenced ? - ret = EPhoneCallHandlingIncomingSoftRejectCBA : - ret = EPhoneCallHandlingIncomingCBA; - } - - // reset the iRingtoneSilence so it won't cause any problems with - // next calls. - SetRingtoneSilencedStatus( EFalse );*/ - -// <-- QT PHONE END --> return ret; }