# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268401550 -7200 # Node ID 7237db0d9fca5fa306ba72830b888354fa263d5a # Parent a4a774cb6ea79695b7ce32e0c6f994c1ae507185 Revision: 201007 Kit: 201008 diff -r a4a774cb6ea7 -r 7237db0d9fca cbs/cbsui/Group/cbsuiApp.rss --- a/cbs/cbsui/Group/cbsuiApp.rss Fri Feb 19 23:21:58 2010 +0200 +++ b/cbs/cbsui/Group/cbsuiApp.rss Fri Mar 12 15:45:50 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -569,8 +569,9 @@ itemflags = EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys; control = LISTBOX { - flags = EAknListBoxMultiselectionList; - height = 5; + flags = EAknListBoxMultiselectionList | + EAknListBoxStylusMultiselectionList; + height = 5; }; } }; @@ -649,7 +650,7 @@ // --------------------------------------------------------- // // r_cb_tl_new_messages -// Text ´%N new messages. +// Text ?N new messages. // // --------------------------------------------------------- // diff -r a4a774cb6ea7 -r 7237db0d9fca cellular/telephonysettings/bwins/PHONESETTINGSU.DEF --- a/cellular/telephonysettings/bwins/PHONESETTINGSU.DEF Fri Feb 19 23:21:58 2010 +0200 +++ b/cellular/telephonysettings/bwins/PHONESETTINGSU.DEF Fri Mar 12 15:45:50 2010 +0200 @@ -1,80 +1,80 @@ EXPORTS - ??1CPsetCallBarring@@UAE@XZ @ 1 NONAME ; CPsetCallBarring::~CPsetCallBarring(void) - ??1CPsetCallDiverting@@UAE@XZ @ 2 NONAME ; CPsetCallDiverting::~CPsetCallDiverting(void) - ??1CPsetCallWaiting@@UAE@XZ @ 3 NONAME ; CPsetCallWaiting::~CPsetCallWaiting(void) - ??1CPsetCli@@UAE@XZ @ 4 NONAME ; CPsetCli::~CPsetCli(void) - ??1CPsetContainer@@UAE@XZ @ 5 NONAME ; CPsetContainer::~CPsetContainer(void) - ??1CPsetCustomerServiceProfile@@UAE@XZ @ 6 NONAME ; CPsetCustomerServiceProfile::~CPsetCustomerServiceProfile(void) - ??1CPsetNetwork@@UAE@XZ @ 7 NONAME ; CPsetNetwork::~CPsetNetwork(void) - ??1CPsetSAObserver@@UAE@XZ @ 8 NONAME ; CPsetSAObserver::~CPsetSAObserver(void) - ?CancelAll@CPsetCli@@UAEXXZ @ 9 NONAME ; void CPsetCli::CancelAll(void) - ?CancelCurrentRequest@CPsetCallBarring@@UAEHXZ @ 10 NONAME ; int CPsetCallBarring::CancelCurrentRequest(void) - ?CancelCurrentRequest@CPsetCallDiverting@@UAEHXZ @ 11 NONAME ; int CPsetCallDiverting::CancelCurrentRequest(void) - ?CancelProcess@CPsetCallWaiting@@UAEHXZ @ 12 NONAME ; int CPsetCallWaiting::CancelProcess(void) - ?CancelProcess@CPsetNetwork@@UAEXXZ @ 13 NONAME ; void CPsetNetwork::CancelProcess(void) - ?ChangePasswordL@CPsetCallBarring@@QAEXAAVTMobilePhonePasswordChangeV2@RMobilePhone@@@Z @ 14 NONAME ; void CPsetCallBarring::ChangePasswordL(class RMobilePhone::TMobilePhonePasswordChangeV2 &) - ?ChangePasswordL@CPsetCallBarring@@QAEXAAVTMobilePhonePasswordChangeV2@RMobilePhone@@H@Z @ 15 NONAME ; void CPsetCallBarring::ChangePasswordL(class RMobilePhone::TMobilePhonePasswordChangeV2 &, int) - ?CreateCBObjectL@CPsetContainer@@QAEPAVCPsetCallBarring@@AAVMPsetBarringObserver@@@Z @ 16 NONAME ; class CPsetCallBarring * CPsetContainer::CreateCBObjectL(class MPsetBarringObserver &) - ?CreateCFObjectL@CPsetContainer@@QAEPAVCPsetCallDiverting@@AAVMPsetDivertObserver@@@Z @ 17 NONAME ; class CPsetCallDiverting * CPsetContainer::CreateCFObjectL(class MPsetDivertObserver &) - ?CreateCWObjectL@CPsetContainer@@QAEPAVCPsetCallWaiting@@AAVMPsetCallWaitingObserver@@@Z @ 18 NONAME ; class CPsetCallWaiting * CPsetContainer::CreateCWObjectL(class MPsetCallWaitingObserver &) - ?CreateCliObjectL@CPsetContainer@@QAEPAVCPsetCli@@AAVMPsetCliObserver@@@Z @ 19 NONAME ; class CPsetCli * CPsetContainer::CreateCliObjectL(class MPsetCliObserver &) - ?CreateNetworkModeObjectL@CPsetContainer@@QAEPAVCPsetNetwork@@AAVMPsetNetworkModeObserver@@@Z @ 20 NONAME ; class CPsetNetwork * CPsetContainer::CreateNetworkModeObjectL(class MPsetNetworkModeObserver &) - ?CreateNetworkObjectL@CPsetContainer@@QAEPAVCPsetNetwork@@AAVMPsetNetworkInfoObserver@@@Z @ 21 NONAME ; class CPsetNetwork * CPsetContainer::CreateNetworkObjectL(class MPsetNetworkInfoObserver &) - ?CreateRefreshHandlerL@CPsetContainer@@QAEPAVCPSetRefreshHandler@@XZ @ 22 NONAME ; class CPSetRefreshHandler * CPsetContainer::CreateRefreshHandlerL(void) - ?GetAvailableNetworksL@CPsetNetwork@@UAEXXZ @ 23 NONAME ; void CPsetNetwork::GetAvailableNetworksL(void) - ?GetBarringStatusL@CPsetCallBarring@@UAEXW4TServiceGroup@@W4TBarringProgram@@@Z @ 24 NONAME ; void CPsetCallBarring::GetBarringStatusL(enum TServiceGroup, enum TBarringProgram) - ?GetCallWaitingStatusL@CPsetCallWaiting@@UAEXXZ @ 25 NONAME ; void CPsetCallWaiting::GetCallWaitingStatusL(void) - ?GetClipModeL@CPsetCli@@UAEXXZ @ 26 NONAME ; void CPsetCli::GetClipModeL(void) - ?GetClirModeL@CPsetCli@@UAEXXZ @ 27 NONAME ; void CPsetCli::GetClirModeL(void) - ?GetCnapL@CPsetCli@@UAEXXZ @ 28 NONAME ; void CPsetCli::GetCnapL(void) - ?GetColpModeL@CPsetCli@@UAEXXZ @ 29 NONAME ; void CPsetCli::GetColpModeL(void) - ?GetColrModeL@CPsetCli@@UAEXXZ @ 30 NONAME ; void CPsetCli::GetColrModeL(void) - ?GetCurrentDivertStatus@CPsetSAObserver@@QAEHAAW4TUnconditionalCFStatus@@@Z @ 31 NONAME ; int CPsetSAObserver::GetCurrentDivertStatus(enum TUnconditionalCFStatus &) - ?GetCurrentNetworkInfo@CPsetNetwork@@UAEHAAUTCurrentNetworkInfo@MPsetNetworkSelect@@@Z @ 32 NONAME ; int CPsetNetwork::GetCurrentNetworkInfo(struct MPsetNetworkSelect::TCurrentNetworkInfo &) - ?GetCurrentNetworkModeSelectionL@CPsetNetwork@@UAEXXZ @ 33 NONAME ; void CPsetNetwork::GetCurrentNetworkModeSelectionL(void) - ?GetDefaultNumbersL@CPsetCallDiverting@@QAEHAAVCDesC16ArrayFlat@@@Z @ 34 NONAME ; int CPsetCallDiverting::GetDefaultNumbersL(class CDesC16ArrayFlat &) - ?GetDivertingStatusL@CPsetCallDiverting@@UAEXW4TServiceGroup@@W4TCallDivertingCondition@@W4TBasicServiceGroups@@@Z @ 35 NONAME ; void CPsetCallDiverting::GetDivertingStatusL(enum TServiceGroup, enum TCallDivertingCondition, enum TBasicServiceGroups) - ?GetNetworkSelectMode@CPsetNetwork@@UAEHAAW4TSelectMode@MPsetNetworkSelect@@@Z @ 36 NONAME ; int CPsetNetwork::GetNetworkSelectMode(enum MPsetNetworkSelect::TSelectMode &) - ?GetTimerValueL@CPsetCallDiverting@@QAEHXZ @ 37 NONAME ; int CPsetCallDiverting::GetTimerValueL(void) - ?GetUsedDataNumberLC@CPsetCallDiverting@@QAEPAVHBufC16@@XZ @ 38 NONAME ; class HBufC16 * CPsetCallDiverting::GetUsedDataNumberLC(void) - ?GetUsedFaxNumberLC@CPsetCallDiverting@@QAEPAVHBufC16@@XZ @ 39 NONAME ; class HBufC16 * CPsetCallDiverting::GetUsedFaxNumberLC(void) - ?IsALSSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 40 NONAME ; int CPsetCustomerServiceProfile::IsALSSupported(int &) - ?IsCBSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 41 NONAME ; int CPsetCustomerServiceProfile::IsCBSupported(int &) - ?IsCFSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 42 NONAME ; int CPsetCustomerServiceProfile::IsCFSupported(int &) - ?IsCWSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 43 NONAME ; int CPsetCustomerServiceProfile::IsCWSupported(int &) - ?IsCallActive@CPsetNetwork@@QAEHXZ @ 44 NONAME ; int CPsetNetwork::IsCallActive(void) - ?IsCallActive@CPsetSAObserver@@QAEHXZ @ 45 NONAME ; int CPsetSAObserver::IsCallActive(void) - ?IsGPRSConnected@CPsetNetwork@@QAEHXZ @ 46 NONAME ; int CPsetNetwork::IsGPRSConnected(void) - ?IsGPRSConnected@CPsetSAObserver@@QAEHXZ @ 47 NONAME ; int CPsetSAObserver::IsGPRSConnected(void) - ?IsNetworkSelectionSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 48 NONAME ; int CPsetCustomerServiceProfile::IsNetworkSelectionSupported(int &) - ?NewL@CPsetCallDiverting@@SAPAV1@AAVMPsetDivertObserver@@AAVRMobilePhone@@@Z @ 49 NONAME ; class CPsetCallDiverting * CPsetCallDiverting::NewL(class MPsetDivertObserver &, class RMobilePhone &) - ?NewL@CPsetCallWaiting@@SAPAV1@AAVRMobilePhone@@AAVMPsetCallWaitingObserver@@@Z @ 50 NONAME ; class CPsetCallWaiting * CPsetCallWaiting::NewL(class RMobilePhone &, class MPsetCallWaitingObserver &) - ?NewL@CPsetCli@@SAPAV1@AAVRMobilePhone@@AAVMPsetCliObserver@@@Z @ 51 NONAME ; class CPsetCli * CPsetCli::NewL(class RMobilePhone &, class MPsetCliObserver &) - ?NewL@CPsetContainer@@SAPAV1@XZ @ 52 NONAME ; class CPsetContainer * CPsetContainer::NewL(void) - ?NewL@CPsetCustomerServiceProfile@@SAPAV1@XZ @ 53 NONAME ; class CPsetCustomerServiceProfile * CPsetCustomerServiceProfile::NewL(void) - ?NewL@CPsetNetwork@@SAPAV1@AAVRMobilePhone@@AAVMPsetNetworkInfoObserver@@@Z @ 54 NONAME ; class CPsetNetwork * CPsetNetwork::NewL(class RMobilePhone &, class MPsetNetworkInfoObserver &) - ?NewL@CPsetNetwork@@SAPAV1@AAVRMobilePhone@@AAVMPsetNetworkModeObserver@@@Z @ 55 NONAME ; class CPsetNetwork * CPsetNetwork::NewL(class RMobilePhone &, class MPsetNetworkModeObserver &) - ?NewL@CPsetSAObserver@@SAPAV1@XZ @ 56 NONAME ; class CPsetSAObserver * CPsetSAObserver::NewL(void) - ?NotifyDivertChange@CPsetSAObserver@@QAEXW4TSelectedLine@@AAVTCallDivertNotifySetting@@ABH@Z @ 57 NONAME ; void CPsetSAObserver::NotifyDivertChange(enum TSelectedLine, class TCallDivertNotifySetting &, int const &) - ?OpenCSProfileL@CPsetCustomerServiceProfile@@QAEHXZ @ 58 NONAME ; int CPsetCustomerServiceProfile::OpenCSProfileL(void) - ?ResetNetworkSearch@CPsetNetwork@@QAEHXZ @ 59 NONAME ; int CPsetNetwork::ResetNetworkSearch(void) - ?SelectNetworkL@CPsetNetwork@@UAEXABUTNetworkInfo@MPsetNetworkSelect@@@Z @ 60 NONAME ; void CPsetNetwork::SelectNetworkL(struct MPsetNetworkSelect::TNetworkInfo const &) - ?SetBarringL@CPsetCallBarring@@UAEXABVTCallBarringSetting@@W4TBasicServiceGroups@@@Z @ 61 NONAME ; void CPsetCallBarring::SetBarringL(class TCallBarringSetting const &, enum TBasicServiceGroups) - ?SetCallWaitingL@CPsetCallWaiting@@UAEXW4TSetCallWaiting@MPsetCallWaiting@@W4TBasicServiceGroups@@@Z @ 62 NONAME ; void CPsetCallWaiting::SetCallWaitingL(enum MPsetCallWaiting::TSetCallWaiting, enum TBasicServiceGroups) - ?SetDivertingL@CPsetCallDiverting@@UAEXABVTCallDivertSetting@@W4TBasicServiceGroups@@H@Z @ 63 NONAME ; void CPsetCallDiverting::SetDivertingL(class TCallDivertSetting const &, enum TBasicServiceGroups, int) - ?SetNetObserver@CPsetSAObserver@@QAEXAAVMPsetNetworkInfoObserver@@@Z @ 64 NONAME ; void CPsetSAObserver::SetNetObserver(class MPsetNetworkInfoObserver &) - ?SetNetSAObserver@CPsetNetwork@@QAEXAAVMPsetNetworkInfoObserver@@@Z @ 65 NONAME ; void CPsetNetwork::SetNetSAObserver(class MPsetNetworkInfoObserver &) - ?SetNetworkModeObserver@CPsetNetwork@@QAEXAAVMPsetNetworkModeObserver@@@Z @ 66 NONAME ; void CPsetNetwork::SetNetworkModeObserver(class MPsetNetworkModeObserver &) - ?SetNetworkModeSelectionL@CPsetNetwork@@UAEXAAK@Z @ 67 NONAME ; void CPsetNetwork::SetNetworkModeSelectionL(unsigned long &) - ?SetNewDefaultNumberL@CPsetCallDiverting@@QAEHAAVTDes16@@@Z @ 68 NONAME ; int CPsetCallDiverting::SetNewDefaultNumberL(class TDes16 &) - ?SetRequestObserver@CPsetCallBarring@@QAEXPAVMPsetRequestObserver@@@Z @ 69 NONAME ; void CPsetCallBarring::SetRequestObserver(class MPsetRequestObserver *) - ?SetRequestObserver@CPsetCallDiverting@@QAEXPAVMPsetRequestObserver@@@Z @ 70 NONAME ; void CPsetCallDiverting::SetRequestObserver(class MPsetRequestObserver *) - ?SetRequestObserver@CPsetCallWaiting@@QAEXPAVMPsetRequestObserver@@@Z @ 71 NONAME ; void CPsetCallWaiting::SetRequestObserver(class MPsetRequestObserver *) - ?SetRequestObserver@CPsetCli@@QAEXPAVMPsetRequestObserver@@@Z @ 72 NONAME ; void CPsetCli::SetRequestObserver(class MPsetRequestObserver *) - ?SetTimerValueL@CPsetCallDiverting@@QAEHABH@Z @ 73 NONAME ; int CPsetCallDiverting::SetTimerValueL(int const &) - ?SetUsedDataNumberL@CPsetCallDiverting@@QAEHAAV?$TBuf@$0GE@@@@Z @ 74 NONAME ; int CPsetCallDiverting::SetUsedDataNumberL(class TBuf<100> &) - ?SetUsedFaxNumberL@CPsetCallDiverting@@QAEHAAV?$TBuf@$0GE@@@@Z @ 75 NONAME ; int CPsetCallDiverting::SetUsedFaxNumberL(class TBuf<100> &) - ?SwapDefaultNumberL@CPsetCallDiverting@@QAEXABH@Z @ 76 NONAME ; void CPsetCallDiverting::SwapDefaultNumberL(int const &) - ?VideoMailQueryL@CPsetCallDiverting@@QAEXAAVTDes16@@@Z @ 77 NONAME ; void CPsetCallDiverting::VideoMailQueryL(class TDes16 &) - ?VoiceMailQueryL@CPsetCallDiverting@@QAEXAAVTDes16@@@Z @ 78 NONAME ; void CPsetCallDiverting::VoiceMailQueryL(class TDes16 &) + ?GetBarringStatusL@CPsetCallBarring@@UAEXW4TServiceGroup@@W4TBarringProgram@@@Z @ 1 NONAME ; void CPsetCallBarring::GetBarringStatusL(enum TServiceGroup, enum TBarringProgram) + ?SetNetworkModeSelectionL@CPsetNetwork@@UAEXAAK@Z @ 2 NONAME ; void CPsetNetwork::SetNetworkModeSelectionL(unsigned long &) + ?GetColpModeL@CPsetCli@@UAEXXZ @ 3 NONAME ; void CPsetCli::GetColpModeL(void) + ?CreateCBObjectL@CPsetContainer@@QAEPAVCPsetCallBarring@@AAVMPsetBarringObserver@@@Z @ 4 NONAME ; class CPsetCallBarring * CPsetContainer::CreateCBObjectL(class MPsetBarringObserver &) + ?SetRequestObserver@CPsetCallBarring@@QAEXPAVMPsetRequestObserver@@@Z @ 5 NONAME ; void CPsetCallBarring::SetRequestObserver(class MPsetRequestObserver *) + ?IsCallActive@CPsetNetwork@@QAEHXZ @ 6 NONAME ; int CPsetNetwork::IsCallActive(void) + ?GetCurrentNetworkInfo@CPsetNetwork@@UAEHAAUTCurrentNetworkInfo@MPsetNetworkSelect@@@Z @ 7 NONAME ; int CPsetNetwork::GetCurrentNetworkInfo(struct MPsetNetworkSelect::TCurrentNetworkInfo &) + ?GetCnapL@CPsetCli@@UAEXXZ @ 8 NONAME ; void CPsetCli::GetCnapL(void) + ?SelectNetworkL@CPsetNetwork@@UAEXABUTNetworkInfo@MPsetNetworkSelect@@@Z @ 9 NONAME ; void CPsetNetwork::SelectNetworkL(struct MPsetNetworkSelect::TNetworkInfo const &) + ?NewL@CPsetNetwork@@SAPAV1@AAVRMobilePhone@@AAVMPsetNetworkInfoObserver@@@Z @ 10 NONAME ; class CPsetNetwork * CPsetNetwork::NewL(class RMobilePhone &, class MPsetNetworkInfoObserver &) + ?GetNetworkSelectMode@CPsetNetwork@@UAEHAAW4TSelectMode@MPsetNetworkSelect@@@Z @ 11 NONAME ; int CPsetNetwork::GetNetworkSelectMode(enum MPsetNetworkSelect::TSelectMode &) + ?SwapDefaultNumberL@CPsetCallDiverting@@QAEXABH@Z @ 12 NONAME ; void CPsetCallDiverting::SwapDefaultNumberL(int const &) + ?VideoMailQueryL@CPsetCallDiverting@@QAEXAAVTDes16@@@Z @ 13 NONAME ; void CPsetCallDiverting::VideoMailQueryL(class TDes16 &) + ?SetBarringL@CPsetCallBarring@@UAEXABVTCallBarringSetting@@W4TBasicServiceGroups@@@Z @ 14 NONAME ; void CPsetCallBarring::SetBarringL(class TCallBarringSetting const &, enum TBasicServiceGroups) + ?IsCallActive@CPsetSAObserver@@QAEHXZ @ 15 NONAME ; int CPsetSAObserver::IsCallActive(void) + ??1CPsetCallWaiting@@UAE@XZ @ 16 NONAME ; CPsetCallWaiting::~CPsetCallWaiting(void) + ?ChangePasswordL@CPsetCallBarring@@QAEXAAVTMobilePhonePasswordChangeV2@RMobilePhone@@@Z @ 17 NONAME ; void CPsetCallBarring::ChangePasswordL(class RMobilePhone::TMobilePhonePasswordChangeV2 &) + ?CreateCliObjectL@CPsetContainer@@QAEPAVCPsetCli@@AAVMPsetCliObserver@@@Z @ 18 NONAME ; class CPsetCli * CPsetContainer::CreateCliObjectL(class MPsetCliObserver &) + ?VoiceMailQueryL@CPsetCallDiverting@@QAEXAAVTDes16@@@Z @ 19 NONAME ; void CPsetCallDiverting::VoiceMailQueryL(class TDes16 &) + ??1CPsetContainer@@UAE@XZ @ 20 NONAME ; CPsetContainer::~CPsetContainer(void) + ?NewL@CPsetNetwork@@SAPAV1@AAVRMobilePhone@@AAVMPsetNetworkModeObserver@@@Z @ 21 NONAME ; class CPsetNetwork * CPsetNetwork::NewL(class RMobilePhone &, class MPsetNetworkModeObserver &) + ?GetDefaultNumbersL@CPsetCallDiverting@@QAEHAAVCDesC16ArrayFlat@@@Z @ 22 NONAME ; int CPsetCallDiverting::GetDefaultNumbersL(class CDesC16ArrayFlat &) + ?NewL@CPsetContainer@@SAPAV1@XZ @ 23 NONAME ; class CPsetContainer * CPsetContainer::NewL(void) + ?CreateCFObjectL@CPsetContainer@@QAEPAVCPsetCallDiverting@@AAVMPsetDivertObserver@@@Z @ 24 NONAME ; class CPsetCallDiverting * CPsetContainer::CreateCFObjectL(class MPsetDivertObserver &) + ?IsGPRSConnected@CPsetSAObserver@@QAEHXZ @ 25 NONAME ; int CPsetSAObserver::IsGPRSConnected(void) + ?IsNetworkSelectionSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 26 NONAME ; int CPsetCustomerServiceProfile::IsNetworkSelectionSupported(int &) + ?GetCurrentDivertStatus@CPsetSAObserver@@QAEHAAW4TUnconditionalCFStatus@@@Z @ 27 NONAME ; int CPsetSAObserver::GetCurrentDivertStatus(enum TUnconditionalCFStatus &) + ??1CPsetCallDiverting@@UAE@XZ @ 28 NONAME ; CPsetCallDiverting::~CPsetCallDiverting(void) + ?OpenCSProfileL@CPsetCustomerServiceProfile@@QAEHXZ @ 29 NONAME ; int CPsetCustomerServiceProfile::OpenCSProfileL(void) + ??1CPsetSAObserver@@UAE@XZ @ 30 NONAME ; CPsetSAObserver::~CPsetSAObserver(void) + ?IsCFSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 31 NONAME ; int CPsetCustomerServiceProfile::IsCFSupported(int &) + ?GetDivertingStatusL@CPsetCallDiverting@@UAEXW4TServiceGroup@@W4TCallDivertingCondition@@W4TBasicServiceGroups@@@Z @ 32 NONAME ; void CPsetCallDiverting::GetDivertingStatusL(enum TServiceGroup, enum TCallDivertingCondition, enum TBasicServiceGroups) + ?NewL@CPsetCallDiverting@@SAPAV1@AAVMPsetDivertObserver@@AAVRMobilePhone@@@Z @ 33 NONAME ; class CPsetCallDiverting * CPsetCallDiverting::NewL(class MPsetDivertObserver &, class RMobilePhone &) + ?SetUsedDataNumberL@CPsetCallDiverting@@QAEHAAV?$TBuf@$0GE@@@@Z @ 34 NONAME ; int CPsetCallDiverting::SetUsedDataNumberL(class TBuf<100> &) + ?CreateNetworkModeObjectL@CPsetContainer@@QAEPAVCPsetNetwork@@AAVMPsetNetworkModeObserver@@@Z @ 35 NONAME ; class CPsetNetwork * CPsetContainer::CreateNetworkModeObjectL(class MPsetNetworkModeObserver &) + ?GetCallWaitingStatusL@CPsetCallWaiting@@UAEXXZ @ 36 NONAME ; void CPsetCallWaiting::GetCallWaitingStatusL(void) + ?ResetNetworkSearch@CPsetNetwork@@QAEHXZ @ 37 NONAME ; int CPsetNetwork::ResetNetworkSearch(void) + ?GetAvailableNetworksL@CPsetNetwork@@UAEXXZ @ 38 NONAME ; void CPsetNetwork::GetAvailableNetworksL(void) + ?SetNewDefaultNumberL@CPsetCallDiverting@@QAEHAAVTDes16@@@Z @ 39 NONAME ; int CPsetCallDiverting::SetNewDefaultNumberL(class TDes16 &) + ?CreateCWObjectL@CPsetContainer@@QAEPAVCPsetCallWaiting@@AAVMPsetCallWaitingObserver@@@Z @ 40 NONAME ; class CPsetCallWaiting * CPsetContainer::CreateCWObjectL(class MPsetCallWaitingObserver &) + ??1CPsetCli@@UAE@XZ @ 41 NONAME ; CPsetCli::~CPsetCli(void) + ?CreateNetworkObjectL@CPsetContainer@@QAEPAVCPsetNetwork@@AAVMPsetNetworkInfoObserver@@@Z @ 42 NONAME ; class CPsetNetwork * CPsetContainer::CreateNetworkObjectL(class MPsetNetworkInfoObserver &) + ?SetUsedFaxNumberL@CPsetCallDiverting@@QAEHAAV?$TBuf@$0GE@@@@Z @ 43 NONAME ; int CPsetCallDiverting::SetUsedFaxNumberL(class TBuf<100> &) + ?CancelCurrentRequest@CPsetCallBarring@@UAEHXZ @ 44 NONAME ; int CPsetCallBarring::CancelCurrentRequest(void) + ?NewL@CPsetCli@@SAPAV1@AAVRMobilePhone@@AAVMPsetCliObserver@@@Z @ 45 NONAME ; class CPsetCli * CPsetCli::NewL(class RMobilePhone &, class MPsetCliObserver &) + ?NotifyDivertChange@CPsetSAObserver@@QAEXW4TSelectedLine@@AAVTCallDivertNotifySetting@@ABH@Z @ 46 NONAME ; void CPsetSAObserver::NotifyDivertChange(enum TSelectedLine, class TCallDivertNotifySetting &, int const &) + ?GetCurrentNetworkModeSelectionL@CPsetNetwork@@UAEXXZ @ 47 NONAME ; void CPsetNetwork::GetCurrentNetworkModeSelectionL(void) + ?GetUsedFaxNumberLC@CPsetCallDiverting@@QAEPAVHBufC16@@XZ @ 48 NONAME ; class HBufC16 * CPsetCallDiverting::GetUsedFaxNumberLC(void) + ?SetNetSAObserver@CPsetNetwork@@QAEXAAVMPsetNetworkInfoObserver@@@Z @ 49 NONAME ; void CPsetNetwork::SetNetSAObserver(class MPsetNetworkInfoObserver &) + ?NewL@CPsetCustomerServiceProfile@@SAPAV1@XZ @ 50 NONAME ; class CPsetCustomerServiceProfile * CPsetCustomerServiceProfile::NewL(void) + ?SetNetworkModeObserver@CPsetNetwork@@QAEXAAVMPsetNetworkModeObserver@@@Z @ 51 NONAME ; void CPsetNetwork::SetNetworkModeObserver(class MPsetNetworkModeObserver &) + ?NewL@CPsetCallWaiting@@SAPAV1@AAVRMobilePhone@@AAVMPsetCallWaitingObserver@@@Z @ 52 NONAME ; class CPsetCallWaiting * CPsetCallWaiting::NewL(class RMobilePhone &, class MPsetCallWaitingObserver &) + ?SetRequestObserver@CPsetCallDiverting@@QAEXPAVMPsetRequestObserver@@@Z @ 53 NONAME ; void CPsetCallDiverting::SetRequestObserver(class MPsetRequestObserver *) + ?CancelCurrentRequest@CPsetCallDiverting@@UAEHXZ @ 54 NONAME ; int CPsetCallDiverting::CancelCurrentRequest(void) + ??1CPsetCallBarring@@UAE@XZ @ 55 NONAME ; CPsetCallBarring::~CPsetCallBarring(void) + ?GetClirModeL@CPsetCli@@UAEXXZ @ 56 NONAME ; void CPsetCli::GetClirModeL(void) + ?SetDivertingL@CPsetCallDiverting@@UAEXABVTCallDivertSetting@@W4TBasicServiceGroups@@H@Z @ 57 NONAME ; void CPsetCallDiverting::SetDivertingL(class TCallDivertSetting const &, enum TBasicServiceGroups, int) + ?CreateRefreshHandlerL@CPsetContainer@@QAEPAVCPSetRefreshHandler@@XZ @ 58 NONAME ; class CPSetRefreshHandler * CPsetContainer::CreateRefreshHandlerL(void) + ?SetRequestObserver@CPsetCallWaiting@@QAEXPAVMPsetRequestObserver@@@Z @ 59 NONAME ; void CPsetCallWaiting::SetRequestObserver(class MPsetRequestObserver *) + ?CancelProcess@CPsetNetwork@@UAEXXZ @ 60 NONAME ; void CPsetNetwork::CancelProcess(void) + ?IsALSSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 61 NONAME ; int CPsetCustomerServiceProfile::IsALSSupported(int &) + ?SetNetObserver@CPsetSAObserver@@QAEXAAVMPsetNetworkInfoObserver@@@Z @ 62 NONAME ; void CPsetSAObserver::SetNetObserver(class MPsetNetworkInfoObserver &) + ?SetRequestObserver@CPsetCli@@QAEXPAVMPsetRequestObserver@@@Z @ 63 NONAME ; void CPsetCli::SetRequestObserver(class MPsetRequestObserver *) + ?NewL@CPsetSAObserver@@SAPAV1@XZ @ 64 NONAME ; class CPsetSAObserver * CPsetSAObserver::NewL(void) + ?CancelAll@CPsetCli@@UAEXXZ @ 65 NONAME ; void CPsetCli::CancelAll(void) + ?ChangePasswordL@CPsetCallBarring@@QAEXAAVTMobilePhonePasswordChangeV2@RMobilePhone@@H@Z @ 66 NONAME ; void CPsetCallBarring::ChangePasswordL(class RMobilePhone::TMobilePhonePasswordChangeV2 &, int) + ?SetTimerValueL@CPsetCallDiverting@@QAEHABH@Z @ 67 NONAME ; int CPsetCallDiverting::SetTimerValueL(int const &) + ??1CPsetCustomerServiceProfile@@UAE@XZ @ 68 NONAME ; CPsetCustomerServiceProfile::~CPsetCustomerServiceProfile(void) + ?GetUsedDataNumberLC@CPsetCallDiverting@@QAEPAVHBufC16@@XZ @ 69 NONAME ; class HBufC16 * CPsetCallDiverting::GetUsedDataNumberLC(void) + ?GetClipModeL@CPsetCli@@UAEXXZ @ 70 NONAME ; void CPsetCli::GetClipModeL(void) + ?CancelProcess@CPsetCallWaiting@@UAEHXZ @ 71 NONAME ; int CPsetCallWaiting::CancelProcess(void) + ?IsGPRSConnected@CPsetNetwork@@QAEHXZ @ 72 NONAME ; int CPsetNetwork::IsGPRSConnected(void) + ?GetColrModeL@CPsetCli@@UAEXXZ @ 73 NONAME ; void CPsetCli::GetColrModeL(void) + ?IsCBSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 74 NONAME ; int CPsetCustomerServiceProfile::IsCBSupported(int &) + ??1CPsetNetwork@@UAE@XZ @ 75 NONAME ; CPsetNetwork::~CPsetNetwork(void) + ?SetCallWaitingL@CPsetCallWaiting@@UAEXW4TSetCallWaiting@MPsetCallWaiting@@W4TBasicServiceGroups@@@Z @ 76 NONAME ; void CPsetCallWaiting::SetCallWaitingL(enum MPsetCallWaiting::TSetCallWaiting, enum TBasicServiceGroups) + ?GetTimerValueL@CPsetCallDiverting@@QAEHXZ @ 77 NONAME ; int CPsetCallDiverting::GetTimerValueL(void) + ?IsCWSupported@CPsetCustomerServiceProfile@@QAEHAAH@Z @ 78 NONAME ; int CPsetCustomerServiceProfile::IsCWSupported(int &) diff -r a4a774cb6ea7 -r 7237db0d9fca cellular/telephonysettings/eabi/phonesettingsu.def --- a/cellular/telephonysettings/eabi/phonesettingsu.def Fri Feb 19 23:21:58 2010 +0200 +++ b/cellular/telephonysettings/eabi/phonesettingsu.def Fri Mar 12 15:45:50 2010 +0200 @@ -100,39 +100,41 @@ _ZTI16CPsetCallBarring @ 99 NONAME _ZTI16CPsetCallWaiting @ 100 NONAME _ZTI18CPsetCallDiverting @ 101 NONAME - _ZTI23CPSetRefreshHandlerImpl @ 102 NONAME - _ZTI27CPsetCustomerServiceProfile @ 103 NONAME - _ZTI8CPsetCli @ 104 NONAME - _ZTV12CPsetNetwork @ 105 NONAME - _ZTV14CPsetContainer @ 106 NONAME - _ZTV14CPsetTelephony @ 107 NONAME - _ZTV15CPsetSAObserver @ 108 NONAME - _ZTV16CPsetCallBarring @ 109 NONAME - _ZTV16CPsetCallWaiting @ 110 NONAME - _ZTV18CPsetCallDiverting @ 111 NONAME - _ZTV23CPSetRefreshHandlerImpl @ 112 NONAME - _ZTV27CPsetCustomerServiceProfile @ 113 NONAME - _ZTV8CPsetCli @ 114 NONAME - _ZThn28_N12CPsetNetwork13CancelProcessEv @ 115 NONAME - _ZThn28_N12CPsetNetwork14SelectNetworkLERKN18MPsetNetworkSelect12TNetworkInfoE @ 116 NONAME - _ZThn28_N12CPsetNetwork20GetNetworkSelectModeERN18MPsetNetworkSelect11TSelectModeE @ 117 NONAME - _ZThn28_N12CPsetNetwork21GetAvailableNetworksLEv @ 118 NONAME - _ZThn28_N12CPsetNetwork21GetCurrentNetworkInfoERN18MPsetNetworkSelect19TCurrentNetworkInfoE @ 119 NONAME - _ZThn28_N16CPsetCallBarring11SetBarringLERK19TCallBarringSetting19TBasicServiceGroups @ 120 NONAME - _ZThn28_N16CPsetCallBarring17GetBarringStatusLE13TServiceGroup15TBarringProgram @ 121 NONAME - _ZThn28_N16CPsetCallBarring20CancelCurrentRequestEv @ 122 NONAME - _ZThn28_N16CPsetCallWaiting13CancelProcessEv @ 123 NONAME - _ZThn28_N16CPsetCallWaiting15SetCallWaitingLEN16MPsetCallWaiting15TSetCallWaitingE19TBasicServiceGroups @ 124 NONAME - _ZThn28_N16CPsetCallWaiting21GetCallWaitingStatusLEv @ 125 NONAME - _ZThn28_N8CPsetCli12GetClipModeLEv @ 126 NONAME - _ZThn28_N8CPsetCli12GetClirModeLEv @ 127 NONAME - _ZThn28_N8CPsetCli12GetColpModeLEv @ 128 NONAME - _ZThn28_N8CPsetCli12GetColrModeLEv @ 129 NONAME - _ZThn28_N8CPsetCli8GetCnapLEv @ 130 NONAME - _ZThn28_N8CPsetCli9CancelAllEv @ 131 NONAME - _ZThn32_N12CPsetNetwork24SetNetworkModeSelectionLERm @ 132 NONAME - _ZThn32_N12CPsetNetwork31GetCurrentNetworkModeSelectionLEv @ 133 NONAME - _ZThn4_N18CPsetCallDiverting13SetDivertingLERK18TCallDivertSetting19TBasicServiceGroupsi @ 134 NONAME - _ZThn4_N18CPsetCallDiverting19GetDivertingStatusLE13TServiceGroup23TCallDivertingCondition19TBasicServiceGroups @ 135 NONAME - _ZThn4_N18CPsetCallDiverting20CancelCurrentRequestEv @ 136 NONAME + _ZTI20CNetworkResetHandler @ 102 NONAME + _ZTI23CPSetRefreshHandlerImpl @ 103 NONAME + _ZTI27CPsetCustomerServiceProfile @ 104 NONAME + _ZTI8CPsetCli @ 105 NONAME + _ZTV12CPsetNetwork @ 106 NONAME + _ZTV14CPsetContainer @ 107 NONAME + _ZTV14CPsetTelephony @ 108 NONAME + _ZTV15CPsetSAObserver @ 109 NONAME + _ZTV16CPsetCallBarring @ 110 NONAME + _ZTV16CPsetCallWaiting @ 111 NONAME + _ZTV18CPsetCallDiverting @ 112 NONAME + _ZTV20CNetworkResetHandler @ 113 NONAME + _ZTV23CPSetRefreshHandlerImpl @ 114 NONAME + _ZTV27CPsetCustomerServiceProfile @ 115 NONAME + _ZTV8CPsetCli @ 116 NONAME + _ZThn28_N12CPsetNetwork13CancelProcessEv @ 117 NONAME + _ZThn28_N12CPsetNetwork14SelectNetworkLERKN18MPsetNetworkSelect12TNetworkInfoE @ 118 NONAME + _ZThn28_N12CPsetNetwork20GetNetworkSelectModeERN18MPsetNetworkSelect11TSelectModeE @ 119 NONAME + _ZThn28_N12CPsetNetwork21GetAvailableNetworksLEv @ 120 NONAME + _ZThn28_N12CPsetNetwork21GetCurrentNetworkInfoERN18MPsetNetworkSelect19TCurrentNetworkInfoE @ 121 NONAME + _ZThn28_N16CPsetCallBarring11SetBarringLERK19TCallBarringSetting19TBasicServiceGroups @ 122 NONAME + _ZThn28_N16CPsetCallBarring17GetBarringStatusLE13TServiceGroup15TBarringProgram @ 123 NONAME + _ZThn28_N16CPsetCallBarring20CancelCurrentRequestEv @ 124 NONAME + _ZThn28_N16CPsetCallWaiting13CancelProcessEv @ 125 NONAME + _ZThn28_N16CPsetCallWaiting15SetCallWaitingLEN16MPsetCallWaiting15TSetCallWaitingE19TBasicServiceGroups @ 126 NONAME + _ZThn28_N16CPsetCallWaiting21GetCallWaitingStatusLEv @ 127 NONAME + _ZThn28_N8CPsetCli12GetClipModeLEv @ 128 NONAME + _ZThn28_N8CPsetCli12GetClirModeLEv @ 129 NONAME + _ZThn28_N8CPsetCli12GetColpModeLEv @ 130 NONAME + _ZThn28_N8CPsetCli12GetColrModeLEv @ 131 NONAME + _ZThn28_N8CPsetCli8GetCnapLEv @ 132 NONAME + _ZThn28_N8CPsetCli9CancelAllEv @ 133 NONAME + _ZThn32_N12CPsetNetwork24SetNetworkModeSelectionLERm @ 134 NONAME + _ZThn32_N12CPsetNetwork31GetCurrentNetworkModeSelectionLEv @ 135 NONAME + _ZThn4_N18CPsetCallDiverting13SetDivertingLERK18TCallDivertSetting19TBasicServiceGroupsi @ 136 NONAME + _ZThn4_N18CPsetCallDiverting19GetDivertingStatusLE13TServiceGroup23TCallDivertingCondition19TBasicServiceGroups @ 137 NONAME + _ZThn4_N18CPsetCallDiverting20CancelCurrentRequestEv @ 138 NONAME diff -r a4a774cb6ea7 -r 7237db0d9fca cellular/telephonysettings/group/phonesettings.mmp --- a/cellular/telephonysettings/group/phonesettings.mmp Fri Feb 19 23:21:58 2010 +0200 +++ b/cellular/telephonysettings/group/phonesettings.mmp Fri Mar 12 15:45:50 2010 +0200 @@ -28,6 +28,7 @@ UID 0x1000008d 0x100058e3 SOURCEPATH ../src +SOURCE CNetworkResetHandler.cpp SOURCE PsetCallWaiting.cpp SOURCE PsetContainer.cpp SOURCE PsetCallBarring.cpp diff -r a4a774cb6ea7 -r 7237db0d9fca cellular/telephonysettings/inc/CNetworkResetHandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/inc/CNetworkResetHandler.h Fri Mar 12 15:45:50 2010 +0200 @@ -0,0 +1,68 @@ +/* +* Copyright (c) 2002-2005 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: CNetworkResetHandler is a async activeobject which handles reseting network call. +* +* +*/ + + +#ifndef CNETWORKRESETHANDLER_H +#define CNETWORKRESETHANDLER_H + +// INCLUDES +#include "PsetNetwork.h" +#include + +// FORWARD DECLARATIONS +class CPsetNetwork; + +/** +* CNetworkResetHandler class is used to handle network reset search requests.´ +*/ +class CNetworkResetHandler : public CActive + { + + public: // constructor & destructor + + static CNetworkResetHandler* NewL( RMobilePhone& aPhone ); + + /* Destructor */ + ~CNetworkResetHandler(); + + /* + * Calls ETEL to start reseting the network. + * @return Error code, or KErrNone. + */ + TInt ResetNetworkSearch(); + + private: + + CNetworkResetHandler( RMobilePhone& aPhone ); + + void ConstructL(); + + void RunL(); + + void DoCancel(); + + // Custom phone. + RMmCustomAPI iCustomApi; + + //Provides client access to mobile phone functionality provided by TSY. + RMobilePhone& iPhone; + + }; +#endif // CNETWORKRESETHANDLER_H + +// end of file diff -r a4a774cb6ea7 -r 7237db0d9fca cellular/telephonysettings/src/CNetworkResetHandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/src/CNetworkResetHandler.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -0,0 +1,137 @@ +/* +* Copyright (c) 2002-2005 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: CNetworkResetHandler is a async activeobject which handles reseting network call. +* +* +*/ + + +// INCLUDE FILES +#include "CNetworkResetHandler.h" +#include "PhoneSettingsLogger.h" + +// MEMBER FUNCTIONS + +// --------------------------------------------------------------------------- +// +// 1st phase constructor for network reseting observer. +// +// --------------------------------------------------------------------------- +// +CNetworkResetHandler* CNetworkResetHandler::NewL( RMobilePhone& aPhone ) + { + __PHSLOGSTRING("[PHS]CNetworkResetHandler::NewL"); + + CNetworkResetHandler* self = new ( ELeave ) CNetworkResetHandler( aPhone ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + return self; + } + + +// --------------------------------------------------------------------------- +// +// C++ constructor. +// +// --------------------------------------------------------------------------- +// +CNetworkResetHandler::CNetworkResetHandler( RMobilePhone& aPhone ) + : CActive( EPriorityStandard ), iPhone ( aPhone ) + { + __PHSLOGSTRING("[PHS]CNetworkResetHandler::CNetworkResetHandler"); + } + +// --------------------------------------------------------------------------- +// +// Destructor. +// +// --------------------------------------------------------------------------- +// +CNetworkResetHandler::~CNetworkResetHandler() + { + __PHSLOGSTRING("[PHS]CNetworkResetHandler::~CNetworkResetHandler"); + + Cancel(); + iCustomApi.Close(); + } + +// --------------------------------------------------------------------------- +// +// ConstructL. +// +// --------------------------------------------------------------------------- +// +void CNetworkResetHandler::ConstructL() + { + __PHSLOGSTRING("[PHS]CNetworkResetHandler::ConstructL"); + CActiveScheduler::Add( this ); + } + +// --------------------------------------------------------------------------- +// +// Close connect to ctsy +// +// --------------------------------------------------------------------------- +// +void CNetworkResetHandler::RunL() + { + __PHSLOGSTRING("[PHS]CNetworkResetHandler::RunL"); + iCustomApi.Close(); + } + +// --------------------------------------------------------------------------- +// +// Requests ETEL to Reset back to the previously used network. +// +// --------------------------------------------------------------------------- +// +TInt CNetworkResetHandler::ResetNetworkSearch() + { + __PHSLOGSTRING("[PHS]--> CNetworkResetHandler::ResetNetworkSearch"); + + TInt error = KErrNone; + + if( IsActive() ) + { + error = KErrInUse; + } + else + { + error = iCustomApi.Open( iPhone ); + } + if( KErrNone == error ) + { + // if there wasn´t already connect open to ETEL or active object wasn´t already in use, + // we can thus send request for reset network server + iCustomApi.ResetNetServer( iStatus ); + SetActive(); + } + __PHSLOGSTRING("[PHS]<-- CNetworkResetHandler::ResetNetworkSearch"); + return error; + } + +// --------------------------------------------------------------------------- +// +// DoCancel. +// +// --------------------------------------------------------------------------- +// +void CNetworkResetHandler::DoCancel() + { + __PHSLOGSTRING("[PHS]CNetworkResetHandler::DoCancel"); + iCustomApi.Close(); + } + +// End of file diff -r a4a774cb6ea7 -r 7237db0d9fca cellular/telephonysettings/src/PsetNetwork.cpp --- a/cellular/telephonysettings/src/PsetNetwork.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/cellular/telephonysettings/src/PsetNetwork.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -18,18 +18,20 @@ // INCLUDE FILES +#include "CNetworkResetHandler.h" #include "MPsetNetworkInfoObs.h" +#include "MPsetNetworkSelect.h" #include "PsetNetwork.h" #include "PsetSAObserver.h" #include "PSetPanic.h" #include "PsetConstants.h" -#include "MPsetNetworkSelect.h" +#include "PhoneSettingsLogger.h" + #include #include #include #include -#include "PhoneSettingsLogger.h" // LOCAL CONSTANTS AND MACROS _LIT( KPSNameOfClass, "CPsetNetwork" ); @@ -89,7 +91,9 @@ delete iNetworkRetrieve; iNetworkRetrieve = NULL; delete iSAObserver; - iSAObserver = NULL; + iSAObserver = NULL; + delete iResetNetworkSearch; + iResetNetworkSearch = NULL; } // --------------------------------------------------------------------------- @@ -145,10 +149,6 @@ // EXPORT_C TInt CPsetNetwork::GetNetworkSelectMode( TSelectMode& aMode ) { - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ RMobilePhone::TMobilePhoneNetworkSelectionV1 setMode; RMobilePhone::TMobilePhoneNetworkSelectionV1Pckg setModePckg( setMode ); @@ -194,10 +194,6 @@ } iTempNetInfo = aInfo; - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ if ( aInfo.iMode == ENetSelectModeManual ) { //Copy data to member variables and make a request. @@ -319,10 +315,7 @@ TInt amount = results->Enumerate(); __PHSLOGSTRING1("[PHS] CPsetNetwork::RunL: amount: %d", amount); TInt i = 0; - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ + RMobilePhone::TMobilePhoneNetworkInfoV2 nwNames; while ( amount > i ) { @@ -474,15 +467,13 @@ { iObserver = &aObserver; iActiveObserver = ENetSelectObserver; - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ + iRegStatus = RMobilePhone::ERegistrationUnknown; User::LeaveIfError( iCustomPhone.Open( iPhone ) ); iSAObserver = CPsetSAObserver::NewL(); CActiveScheduler::Add( this ); + iResetNetworkSearch = CNetworkResetHandler::NewL( iPhone ); } // --------------------------------------------------------------------------- @@ -495,13 +486,11 @@ { iNetworkModeObserver = &aModeObserver; iActiveObserver = ENetModeObserver; - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ + User::LeaveIfError( iCustomPhone.Open( iPhone ) ); CActiveScheduler::Add( this ); + iResetNetworkSearch = CNetworkResetHandler::NewL( iPhone ); } // --------------------------------------------------------------------------- @@ -562,15 +551,11 @@ EXPORT_C TInt CPsetNetwork::ResetNetworkSearch() { __PHSLOGSTRING("[PHS]--> CPsetNetwork::ResetNetworkSearch"); - RMmCustomAPI customApi; - TInt error = customApi.Open( iPhone ); - if (error == KErrNone) - { - customApi.ResetNetServer(); - } - customApi.Close(); - - __PHSLOGSTRING("[PHS] <--CPsetNetwork::ResetNetworkSearch"); + + TInt error = iResetNetworkSearch->ResetNetworkSearch(); + + __PHSLOGSTRING1("[PHS] <--CPsetNetwork::ResetNetworkSearch: error: %d", error); + //for compatibility reasons returns a value return error; } diff -r a4a774cb6ea7 -r 7237db0d9fca engines/vmbxengine/conf/voicemailbox.confml Binary file engines/vmbxengine/conf/voicemailbox.confml has changed diff -r a4a774cb6ea7 -r 7237db0d9fca networkhandling/networkhandlingengine/NetworkHandlingGsmSrc/CNWNetworkMCNEngine.cpp --- a/networkhandling/networkhandlingengine/NetworkHandlingGsmSrc/CNWNetworkMCNEngine.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/networkhandling/networkhandlingengine/NetworkHandlingGsmSrc/CNWNetworkMCNEngine.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -16,8 +16,6 @@ * */ - - // INCLUDE FILES #include "CNWGsmSessionImplementation.h" #include "CNWGsmMessageHandler.h" @@ -28,14 +26,13 @@ #include #include #include -#include +#include // CONSTANTS const TUint KNWzero = 0; const TInt KMCNOn = 1; const TInt KMCNOff = 0; - // ============================ MEMBER FUNCTIONS ============================== // ---------------------------------------------------------------------------- diff -r a4a774cb6ea7 -r 7237db0d9fca networkhandling/networkhandlingengine/NetworkHandlingSrc/CNWMessageHandler.cpp --- a/networkhandling/networkhandlingengine/NetworkHandlingSrc/CNWMessageHandler.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/networkhandling/networkhandlingengine/NetworkHandlingSrc/CNWMessageHandler.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "NWHandlingEngine.h" #include "CNWMessageHandler.h" #include "CNWNetworkCurrentNetworkMonitor.h" @@ -44,7 +44,6 @@ const TInt KNWNetworkMonitorDynamicCaps = 3; #endif // RD_PHONE_NG - // ============================ MEMBER FUNCTIONS ============================== // ---------------------------------------------------------------------------- diff -r a4a774cb6ea7 -r 7237db0d9fca phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdRequestHandler.cpp --- a/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdRequestHandler.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/phoneclientserver/phoneclient/Src/UssdWrapper/CPhCltUssdRequestHandler.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -74,7 +74,6 @@ { Cancel(); - iUssdClient.CancelSend(); iUssdClient.Close(); iPhClient.Close(); diff -r a4a774cb6ea7 -r 7237db0d9fca phonesrv_plat/call_information_api/tsrc/group/MT_CallInformation.mmp --- a/phonesrv_plat/call_information_api/tsrc/group/MT_CallInformation.mmp Fri Feb 19 23:21:58 2010 +0200 +++ b/phonesrv_plat/call_information_api/tsrc/group/MT_CallInformation.mmp Fri Mar 12 15:45:50 2010 +0200 @@ -41,6 +41,7 @@ USERINCLUDE ../src MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE // cntdef.h SYSTEMINCLUDE /epoc32/include/Digia/EUnit #if defined(WINSCW) SYSTEMINCLUDE ../../../../../../app/phone/inc diff -r a4a774cb6ea7 -r 7237db0d9fca phonesrv_plat/phone_settings_api/inc/PsetNetwork.h --- a/phonesrv_plat/phone_settings_api/inc/PsetNetwork.h Fri Feb 19 23:21:58 2010 +0200 +++ b/phonesrv_plat/phone_settings_api/inc/PsetNetwork.h Fri Mar 12 15:45:50 2010 +0200 @@ -29,6 +29,7 @@ #include // FORWARD DECLARATIONS +class CNetworkResetHandler; class CPsetSAObserver; class CRetrieveMobilePhoneDetectedNetworks; class RMmCustomAPI; @@ -37,7 +38,6 @@ /** * CPsetNetwork class is used to handle network change requests. * @lib phonesettings.lib -* @since 1.0 */ class CPsetNetwork : public CActive, public MPsetNetworkSelect, @@ -52,10 +52,6 @@ * @param aObserver Reference to network observer. * @return Returns the CPsetNetwork-object */ - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ IMPORT_C static CPsetNetwork* NewL( RMobilePhone& aPhone, MPsetNetworkInfoObserver& aObserver ); @@ -66,10 +62,6 @@ * @param aObserver Reference to network observer. * @return Returns the CPsetNetwork-object */ - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ IMPORT_C static CPsetNetwork* NewL( RMobilePhone& aPhone, MPsetNetworkModeObserver& aObserver ); @@ -166,10 +158,6 @@ // this is required for the net container to create a pointer void ConstructL( MPsetNetworkModeObserver& aObserver ); - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ CPsetNetwork( RMobilePhone& aPhone ); private: //new @@ -188,52 +176,38 @@ private: //Latest network settings information - TNetworkInfo iTempNetInfo; + TNetworkInfo iTempNetInfo; + //Provides client access to mobile phone functionality provided by TSY. - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ RMobilePhone& iPhone; + //Currently active request. MPsetNetworkInfoObserver::TServiceRequest iServiceRequest; + //Observer CPsetSAObserver* iSAObserver; + //Network information observer - MPsetNetworkInfoObserver* iObserver; + MPsetNetworkInfoObserver* iObserver; + //Fetched network information (names, IDs) - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ CRetrieveMobilePhoneDetectedNetworks* iNetworkRetrieve; + //Current registartion status - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ RMobilePhone::TMobilePhoneRegistrationStatus iRegStatus; - - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ + //Selected network information RMobilePhone::TMobilePhoneNetworkManualSelection iNwInfo; - + // // Network Mode related variables // //Network mode observer MPsetNetworkModeObserver* iNetworkModeObserver; - - /***************************************************** - * Series 60 Customer / ETel - * Series 60 ETel API - *****************************************************/ + // Custom phone. RMmCustomAPI iCustomPhone; - + //Currently active request. MPsetNetworkModeObserver::TServiceRequest iModeRequest; @@ -242,6 +216,10 @@ //Currently active observer, for assert handling TInt iActiveObserver; + + //Active object observer for reseting network search handling + CNetworkResetHandler* iResetNetworkSearch; }; + #endif // PSETNETWORK_H // end of file diff -r a4a774cb6ea7 -r 7237db0d9fca satengine/SatServer/Commands/SendSSCmd/group/SendSsCmd.mmp --- a/satengine/SatServer/Commands/SendSSCmd/group/SendSsCmd.mmp Fri Feb 19 23:21:58 2010 +0200 +++ b/satengine/SatServer/Commands/SendSSCmd/group/SendSsCmd.mmp Fri Mar 12 15:45:50 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -15,7 +15,6 @@ * */ - #include #include #include "../../../inc/SatMacroes.h" @@ -45,18 +44,17 @@ USERINCLUDE ../../../inc USERINCLUDE ../inc -// The application domain layer systeminclude is needed as PhoneParser and PhoneSettings are used in SS. +// The application domain layer systeminclude is needed as PhoneParser is used APP_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/ecom -SYSTEMINCLUDE ../../../../../inc // Domain telephony -SYSTEMINCLUDE ../../../../inc // Subsystem satengine +SYSTEMINCLUDE ../../../../../inc // Domain telephony +SYSTEMINCLUDE ../../../../inc // Subsystem satengine LIBRARY euser.lib LIBRARY etelsat.lib LIBRARY SatEngine.lib LIBRARY PhoneParser.lib -LIBRARY customAPI.lib // RMmCustomAPI -LIBRARY psui.lib +LIBRARY customAPI.lib // RMmCustomAPI LIBRARY etel.lib LIBRARY etelmm.lib LIBRARY phonesettings.lib diff -r a4a774cb6ea7 -r 7237db0d9fca satengine/SatServer/Commands/SendSSCmd/src/csatsendsshandler.cpp --- a/satengine/SatServer/Commands/SendSSCmd/src/csatsendsshandler.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/satengine/SatServer/Commands/SendSSCmd/src/csatsendsshandler.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -15,18 +15,12 @@ * */ - #include "csatsendsshandler.h" -#include -#include #include #include #include -#include #include -#include #include -#include #include "csatsendssbarringnouiobs.h" #include "csatsendssdivertnouiobs.h" diff -r a4a774cb6ea7 -r 7237db0d9fca satengine/SatServer/Engine/src/CSatApnHandler.cpp --- a/satengine/SatServer/Engine/src/CSatApnHandler.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/satengine/SatServer/Engine/src/CSatApnHandler.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -15,8 +15,6 @@ * */ - - // INCLUDE FILES #include #include @@ -29,13 +27,7 @@ #include "CSatApnHandler.h" #include "SatLog.h" - -const TInt KMaxAccessPointName( 50 ); -// Granularity for getting connection methods from CM session const TUint32 KSatCMGranularity( 5 ); -// The max length of access point name -const TUint32 KSatMaxApnName( 236 ); - // ============================ MEMBER FUNCTIONS =============================== diff -r a4a774cb6ea7 -r 7237db0d9fca satengine/SatServer/Engine/src/csatmediatoreventprovider.cpp --- a/satengine/SatServer/Engine/src/csatmediatoreventprovider.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/satengine/SatServer/Engine/src/csatmediatoreventprovider.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "SATPrivateCRKeys.h" #include "csatmediatoreventprovider.h" diff -r a4a774cb6ea7 -r 7237db0d9fca satengine/SatServer/inc/CSatCommandHandler.h --- a/satengine/SatServer/inc/CSatCommandHandler.h Fri Feb 19 23:21:58 2010 +0200 +++ b/satengine/SatServer/inc/CSatCommandHandler.h Fri Mar 12 15:45:50 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include #include "MSatUtils.h" #include "MSatEventObserver.h" #include "MSatCommand.h" diff -r a4a774cb6ea7 -r 7237db0d9fca satui/satapp/SATShellControllerSrc/CSatShellController.cpp --- a/satui/satapp/SATShellControllerSrc/CSatShellController.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/satui/satapp/SATShellControllerSrc/CSatShellController.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -41,7 +41,7 @@ // Browser Cen Rep Keys. #ifdef __SERIES60_NATIVE_BROWSER #include - #include + #include #endif // __SERIES60_NATIVE_BROWSER #include "tflogger.h" diff -r a4a774cb6ea7 -r 7237db0d9fca satui/satapp/SATUISrc/CSatUiActionPerformer.cpp --- a/satui/satapp/SATUISrc/CSatUiActionPerformer.cpp Fri Feb 19 23:21:58 2010 +0200 +++ b/satui/satapp/SATUISrc/CSatUiActionPerformer.cpp Fri Mar 12 15:45:50 2010 +0200 @@ -45,7 +45,7 @@ #include // General Settings Cen Rep Keys. -#include +#include // CONSTANTS