diff -r ba76fc04e6c2 -r 6b911d05207e phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp --- a/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp Fri Jun 04 10:19:18 2010 +0100 +++ b/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp Wed Jun 23 18:12:20 2010 +0300 @@ -551,10 +551,6 @@ retVal = R_PHONEUI_SEND_DTMF_NORMAL_EDIT_BOX_CBA; break; - case EPhoneDtmfSpeedDialNormalEditBoxCBA: - retVal = R_PHONEUI_DTMF_SPEED_DIAL_NORMAL_EDIT_BOX_CBA; - break; - case EPhoneNumberAcqCBA: if ( iVariationFlags & EOnscreenDialer ) { @@ -1004,18 +1000,6 @@ retVal = R_PHONEUI_TITLE_IN_DTMF_FETCH; break; - case EPhoneDtmfSpeedDialNumberQuery: - retVal = R_PHONEUI_DTMF_SPEED_DIAL_NUMBER_QUERY; - break; - - case EPhoneDtmfSpeedDialNotAssigned: - retVal = R_ERROR_NOTE_SPEED_DIAL_NOT_ASSIGNED; - break; - - case EPhoneDtmfInvalidSpeedDial: - retVal = R_ERROR_NOTE_INVALID_SPEED_DIAL; - break; - case EPhoneAlsLineChangeConfirmationQuery: retVal = R_PHONEUI_ALS_CONFIRMATION_QUERY; break; @@ -1072,10 +1056,6 @@ retVal = R_PHONE_INCALL_MUTED_PANE; break; - case EPhoneInCallNumberText: - retVal = R_PHONEUI_INCALL_CALL_NUMBER; - break; - case EPhoneInCallDisconnected: retVal = R_PHONEUI_INCALL_CALL_DISCONNECTED; break; @@ -1112,10 +1092,6 @@ retVal = R_PHONE_CONFIRMATION_NOTE; break; - case EPhonePhoneImeiString: - retVal = R_PHONE_IMEI_STRING; - break; - case EPhoneSecurityInformationNote: retVal = R_PHONE_SECURITY_INFORMATION_NOTE; break; @@ -1191,6 +1167,10 @@ retVal = R_PHONEUI_MTCAL_CLI_WITHHELD; break; + case EPhoneCallCLIUnknown: + retVal = R_PHONEUI_MTCAL_CLI_UNKNOWN; + break; + case EPhoneNoteTextCallSummary: retVal = R_PHONEUI_NOTE_TEXT_POST_CALL_SUMMARY; break; @@ -1203,10 +1183,6 @@ retVal = R_PHONEUI_IDLE_TIME_FORMAT; break; - case EPhoneLifeTimeFormat: - retVal = R_PHONEUI_LIFE_TIMER_STRING; - break; - case EPhoneNoteTextPEFailedAtStartup: retVal = R_PHONEUI_NOTE_TEXT_PHONE_ENGINE_FAILED_AT_STARTUP; break; @@ -1485,10 +1461,6 @@ retVal = R_PHONEUI_DIALER_NUMBERENTRY_PROMPT_TEXT; break; - case EPhoneCall: - retVal = R_PHONEUI_MTCAL_CALL; - break; - case EPhoneVideoCallSetupFailedCreateVoiceCallToTheSameContactText: retVal = R_NOTE_INCAL_QUERY_VCALL_FAILED; break;