# HG changeset patch # User hgs # Date 1284732553 -10800 # Node ID 78df25012fdac9c35b904e5e0efd4addc3e38f22 # Parent 2fa1fa551b0bda065ceb27bd3d2a6aba4f97a352 201037 diff -r 2fa1fa551b0b -r 78df25012fda cellular/psetnotesui/data/psui_stub.pkg --- a/cellular/psetnotesui/data/psui_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -; -; Copyright (c) 2009 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: For packing psui stub component. -; -; psui_stub.pkg - -; Languages -&EN - -; Header -#{"psui"},(0x100059C6),1,0,0,TYPE=SA - -;Localised Vendor name -%{"Nokia"} - -;Unique Vendor name -:"Nokia" - -; Target - -""-"z:\sys\bin\psui.dll" -""-"z:\resource\psui.rsc" \ No newline at end of file diff -r 2fa1fa551b0b -r 78df25012fda cellular/psetnotesui/data/psui_stub.sis Binary file cellular/psetnotesui/data/psui_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/psetnotesui/group/bld.inf --- a/cellular/psetnotesui/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/psetnotesui/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -26,7 +26,7 @@ PRJ_EXPORTS ../inc/psuiresourceloader.h |../../../inc/psuiresourceloader.h -../data/psui_stub.sis /epoc32/data/z/system/install/psui_stub.sis +../rom/psui_stub.sis /epoc32/data/z/system/install/psui_stub.sis // IBY Files ../rom/psui.iby CORE_APP_LAYER_IBY_EXPORT_PATH(psui.iby) diff -r 2fa1fa551b0b -r 78df25012fda cellular/psetnotesui/group/psui.mmp --- a/cellular/psetnotesui/group/psui.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/psetnotesui/group/psui.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -24,6 +24,7 @@ TARGET psui.dll TARGETTYPE dll UID 0x1000008d 0x100059C6 +VERSION 10.0 SOURCEPATH ../src SOURCE psuibarringobs.cpp diff -r 2fa1fa551b0b -r 78df25012fda cellular/psetnotesui/rom/psui_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/psetnotesui/rom/psui_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; Copyright (c) 2009 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: For packing psui stub component. +; +; psui_stub.pkg + +; Languages +&EN + +; Header +#{"psui"},(0x100059C6),1,0,0,TYPE=SA + +;Localised Vendor name +%{"Nokia"} + +;Unique Vendor name +:"Nokia" + +; Target + +""-"z:\sys\bin\psui.dll" +""-"z:\resource\psui.rsc" \ No newline at end of file diff -r 2fa1fa551b0b -r 78df25012fda cellular/psetnotesui/rom/psui_stub.sis Binary file cellular/psetnotesui/rom/psui_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/psuinotes/psuinotes.pro --- a/cellular/psuinotes/psuinotes.pro Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/psuinotes/psuinotes.pro Fri Sep 17 17:09:13 2010 +0300 @@ -38,6 +38,7 @@ TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = CAP_GENERAL_DLL TARGET.UID3 = 0X200315B9 + VERSION = 10.0 defFiles = \ "$${LITERAL_HASH}ifdef WINS" \ @@ -55,8 +56,10 @@ BLD_INF_RULES.prj_exports += \ "$${LITERAL_HASH}include " \ "./rom/psuinotes.iby CORE_MW_LAYER_IBY_EXPORT_PATH(psuinotes.iby)" + BLD_INF_RULES.prj_exports += \ + "./rom/psuinotes_stub.sis /epoc32/data/z/system/install/psuinotes_stub.sis" } else: { - INCLUDEPATH += ../../../../../mw/phonesrv/phonesrv_plat/phone_settings_api/inc + INCLUDEPATH += ../../../../../mw/phonesrv/phonesrv_plat/phone_settings_api/inc INCLUDEPATH += ../../../../../mw/gsprofilesrv/controlpanel/controlpanel_plat/inc DESTDIR = c:\hb\lib DLLDESTDIR = c:\hb\bin diff -r 2fa1fa551b0b -r 78df25012fda cellular/psuinotes/rom/psuinotes.iby --- a/cellular/psuinotes/rom/psuinotes.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/psuinotes/rom/psuinotes.iby Fri Sep 17 17:09:13 2010 +0300 @@ -20,6 +20,7 @@ #include -file=ABI_DIR/BUILD_DIR/psuinotes.dll SHARED_LIB_DIR/psuinotes.dll +file=ABI_DIR/BUILD_DIR/psuinotes.dll SHARED_LIB_DIR/psuinotes.dll +data=ZSYSTEM\install\psuinotes_stub.sis System\Install\psuinotes_stub.sis #endif diff -r 2fa1fa551b0b -r 78df25012fda cellular/psuinotes/rom/psuinotes_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/psuinotes/rom/psuinotes_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 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: For packing phone contact finder stub. +; +; Languages +&EN + + +; SIS header: name, uid, version +#{"psuinotes"},(0X200315B9),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +"" - "z:\sys\bin\psuinotes.dll" + diff -r 2fa1fa551b0b -r 78df25012fda cellular/psuinotes/rom/psuinotes_stub.sis Binary file cellular/psuinotes/rom/psuinotes_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/psuinotes/src/psuinotes.cpp --- a/cellular/psuinotes/src/psuinotes.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/psuinotes/src/psuinotes.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -297,16 +297,10 @@ // configure editor so that only digits can be inputted passwordDialog->setPromptText(title); passwordDialog->setEchoMode(HbLineEdit::Password); - passwordDialog->setInputMethodHints(Qt::ImhDigitsOnly); passwordDialog->actions().at(0)->setEnabled(false); - HbLineEdit *hbLineEdit = passwordDialog->lineEdit(); hbLineEdit->setMaxLength(maxPasswordLength); - - HbEditorInterface editorInterface(hbLineEdit); - editorInterface.setMode(HbInputModeNumeric); - editorInterface.setInputConstraints(HbEditorConstraintFixedInputMode); - editorInterface.setFilter(HbDigitsOnlyFilter::instance()); + hbLineEdit->setInputMethodHints(Qt::ImhDigitsOnly); m_passwordValidator = &validator; diff -r 2fa1fa551b0b -r 78df25012fda cellular/psuinotes/src/psuiutils.cpp --- a/cellular/psuinotes/src/psuiutils.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/psuinotes/src/psuiutils.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -51,6 +51,7 @@ case KErrGsmSSIllegalEquipment: case KErrGsmSSCallBarred: case KErrGsmSSDataMissing: + case KErrAccessDenied: errorText = hbTrId("txt_phone_info_not_allowed"); break; case KErrGsmSSIncompatibility: @@ -65,37 +66,24 @@ break; case KErrGsmSSNegativePasswordCheck: case KErrGsmSSPasswordRegistrationFailure: - errorText = hbTrId("Password error"); + errorText = hbTrId("txt_phone_info_password_error"); break; case KErrGsmSSPasswordAttemptsViolation: errorText = hbTrId("txt_phone_info_barring_password_blocked"); break; case KErrGsmSMSNoNetworkService: case KErrGsmNoService: - errorText = hbTrId("No network coverage"); + errorText = hbTrId("txt_phone_info_no_network_coverage"); break; case KErrSsActivationDataLost: - errorText = hbTrId("Check network services"); + errorText = hbTrId("txt_phone_info_check_network_services"); break; case KErrGsmOfflineOpNotAllowed: if(XQSysInfo::isSupported(KFeatureIdOfflineMode)){ - XQSettingsManager *xqsettingsManager = new XQSettingsManager(); - XQSettingsKey key(XQSettingsKey::TargetPublishAndSubscribe, - KPSUidBluetoothSapConnectionState.iUid, - KBTSapConnectionState); - QVariant startupValue = xqsettingsManager->readItemValue(key); - int value = startupValue.toInt(); - delete xqsettingsManager; - xqsettingsManager = NULL; - if (value == EBTSapConnected){ - errorText = hbTrId("Operation not possible in SIM access profile mode"); - } else { - errorText = hbTrId("Operation not possible in Off-line mode"); - } + errorText = hbTrId("txt_phone_info_offline_not_allowed"); } else { errorText = hbTrId("txt_phone_info_request_not_completed"); } - break; case KErrGsmSSUnknownAlphabet: errorText = hbTrId("txt_phone_info_invalid_phone_number"); diff -r 2fa1fa551b0b -r 78df25012fda cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.cpp --- a/cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -96,6 +96,9 @@ PsUiUtils::errorCodeTextMapping(KErrGsmSSDataMissing, text); QCOMPARE( text, QString( "txt_phone_info_not_allowed")); + PsUiUtils::errorCodeTextMapping(KErrAccessDenied, text); + QCOMPARE( text, QString( + "txt_phone_info_not_allowed")); PsUiUtils::errorCodeTextMapping(KErrGsmSSIncompatibility, text); QCOMPARE( text, QString( "txt_phone_info_conflict_error")); @@ -110,22 +113,22 @@ "txt_phone_info_request_rejected")); PsUiUtils::errorCodeTextMapping(KErrGsmSSNegativePasswordCheck, text); QCOMPARE( text, QString( - "Password error")); + "txt_phone_info_password_error")); PsUiUtils::errorCodeTextMapping(KErrGsmSSPasswordRegistrationFailure, text); QCOMPARE( text, QString( - "Password error")); + "txt_phone_info_password_error")); PsUiUtils::errorCodeTextMapping(KErrGsmSSPasswordAttemptsViolation, text); QCOMPARE( text, QString( "txt_phone_info_barring_password_blocked")); PsUiUtils::errorCodeTextMapping(KErrGsmSMSNoNetworkService, text); QCOMPARE( text, QString( - "No network coverage")); + "txt_phone_info_no_network_coverage")); PsUiUtils::errorCodeTextMapping(KErrGsmNoService, text); QCOMPARE( text, QString( - "No network coverage")); + "txt_phone_info_no_network_coverage")); PsUiUtils::errorCodeTextMapping(KErrSsActivationDataLost, text); QCOMPARE( text, QString( - "Check network services")); + "txt_phone_info_check_network_services")); PsUiUtils::errorCodeTextMapping(KErrGsmSSUnknownAlphabet, text); QCOMPARE( text, QString("txt_phone_info_invalid_phone_number")); @@ -136,18 +139,11 @@ QVERIFY( verify() ); expect("XQSysInfo::isSupported").returns(true); - expect("XQSettingsManager::readItemValue").returns(QVariant(EBTSapConnected)); PsUiUtils::errorCodeTextMapping(KErrGsmOfflineOpNotAllowed, text); QCOMPARE( text, QString( - "Operation not possible in SIM access profile mode")); - QVERIFY( verify() ); - - expect("XQSysInfo::isSupported").returns(true); - expect("XQSettingsManager::readItemValue").returns(QVariant(EBTSapNotConnected)); - PsUiUtils::errorCodeTextMapping(KErrGsmOfflineOpNotAllowed, text); - QCOMPARE( text, QString( - "Operation not possible in Off-line mode")); - + "txt_phone_info_offline_not_allowed")); + QVERIFY( verify() ); + PsUiUtils::errorCodeTextMapping(-1, text); QCOMPARE( text, QString( "txt_phone_info_request_not_completed")); diff -r 2fa1fa551b0b -r 78df25012fda cellular/servicerequest/data/servicerequest_stub.pkg --- a/cellular/servicerequest/data/servicerequest_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -; -; Copyright (c) 2009 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: -; -; servicerequest_stub.pkg - -; Languages -&EN - -; Header -#{"servicerequest"},(0x10005A3D),1,0,0,TYPE=SA - -;Localised Vendor name -%{"Nokia"} - -;Unique Vendor name -:"Nokia" - -; Target - -""-"z:\sys\bin\servicerequest.dll" -""-"z:\resource\ServiceRequest.rsc" diff -r 2fa1fa551b0b -r 78df25012fda cellular/servicerequest/data/servicerequest_stub.sis Binary file cellular/servicerequest/data/servicerequest_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/servicerequest/group/bld.inf --- a/cellular/servicerequest/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/servicerequest/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -23,7 +23,7 @@ PRJ_EXPORTS ../inc/cservicerequest.h |../../../inc/cservicerequest.h ../inc/mservicerequestobserver.h |../../../inc/mservicerequestobserver.h -../data/servicerequest_stub.sis /epoc32/data/z/system/install/servicerequest_stub.sis +../rom/servicerequest_stub.sis /epoc32/data/z/system/install/servicerequest_stub.sis ../rom/servicerequest.iby CORE_APP_LAYER_IBY_EXPORT_PATH(servicerequest.iby) ../rom/servicerequestresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(servicerequestresources.iby) diff -r 2fa1fa551b0b -r 78df25012fda cellular/servicerequest/group/servicerequest.mmp --- a/cellular/servicerequest/group/servicerequest.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/servicerequest/group/servicerequest.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -24,6 +24,7 @@ TARGET servicerequest.dll TARGETTYPE DLL UID 0x1000008d 0x10005A3D +VERSION 10.0 SOURCEPATH ../src SOURCE cservicerequest.cpp diff -r 2fa1fa551b0b -r 78df25012fda cellular/servicerequest/rom/servicerequest_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/servicerequest/rom/servicerequest_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; Copyright (c) 2009 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: +; +; servicerequest_stub.pkg + +; Languages +&EN + +; Header +#{"servicerequest"},(0x10005A3D),1,0,0,TYPE=SA + +;Localised Vendor name +%{"Nokia"} + +;Unique Vendor name +:"Nokia" + +; Target + +""-"z:\sys\bin\servicerequest.dll" +""-"z:\resource\ServiceRequest.rsc" diff -r 2fa1fa551b0b -r 78df25012fda cellular/servicerequest/rom/servicerequest_stub.sis Binary file cellular/servicerequest/rom/servicerequest_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/group/bld.inf --- a/cellular/sssettings/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/sssettings/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -26,7 +26,7 @@ ../inc/csssettingsrefreshcontainer.h |../../../inc/csssettingsrefreshcontainer.h ../inc/msssettingsrefreshhandler.h |../../../inc/msssettingsrefreshhandler.h -../group/sssettings_stub.sis /epoc32/data/z/system/install/sssettings_stub.sis +../rom/sssettings_stub.sis /epoc32/data/z/system/install/sssettings_stub.sis // IBY files ../rom/sssettings.iby CORE_APP_LAYER_IBY_EXPORT_PATH(sssettings.iby) diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/group/sssettings.mmp --- a/cellular/sssettings/group/sssettings.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/sssettings/group/sssettings.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -22,6 +22,7 @@ TARGET sssettings.dll TARGETTYPE dll UID 0x1000008d 0x10005A01 +VERSION 10.0 VENDORID VID_DEFAULT diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/group/sssettings.pkg --- a/cellular/sssettings/group/sssettings.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing sssettings component. -; -; Languages -&EN - -; Header -#{"SSSettings"}, (0x10005A01), 10, 1, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -"\epoc32\RELEASE\armv5\UREL\SSSettings.dll"-"z:\sys\bin\SSSettings.dll" diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/group/sssettings_stub.pkg --- a/cellular/sssettings/group/sssettings_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing sssettings stub component. -; -; Languages -&EN - -; Header -#{"SSSettings"}, (0x10005A01), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\SSSettings.dll" diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/group/sssettings_stub.sis Binary file cellular/sssettings/group/sssettings_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/rom/sssettings.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/sssettings/rom/sssettings.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing sssettings component. +; +; Languages +&EN + +; Header +#{"SSSettings"}, (0x10005A01), 10, 1, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +"\epoc32\RELEASE\armv5\UREL\SSSettings.dll"-"z:\sys\bin\SSSettings.dll" diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/rom/sssettings_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/sssettings/rom/sssettings_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing sssettings stub component. +; +; Languages +&EN + +; Header +#{"SSSettings"}, (0x10005A01), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\SSSettings.dll" diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/rom/sssettings_stub.sis Binary file cellular/sssettings/rom/sssettings_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/xqbindings/sssettingswrapper/rom/sssettingswrapper.iby --- a/cellular/sssettings/xqbindings/sssettingswrapper/rom/sssettingswrapper.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/sssettings/xqbindings/sssettingswrapper/rom/sssettingswrapper.iby Fri Sep 17 17:09:13 2010 +0300 @@ -20,6 +20,7 @@ #include -file=ABI_DIR\BUILD_DIR\sssettingswrapper.dll SHARED_LIB_DIR\sssettingswrapper.dll +file=ABI_DIR\BUILD_DIR\sssettingswrapper.dll SHARED_LIB_DIR\sssettingswrapper.dll +data=ZSYSTEM\install\sssettingswrapper_stub.sis System\Install\sssettingswrapper_stub.sis #endif diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/xqbindings/sssettingswrapper/rom/sssettingswrapper_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/sssettings/xqbindings/sssettingswrapper/rom/sssettingswrapper_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 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: For packing phone contact finder stub. +; +; Languages +&EN + + +; SIS header: name, uid, version +#{"sssettingswrapper"},(0X20029F22),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +"" - "z:\sys\bin\sssettingswrapper.dll" + diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/xqbindings/sssettingswrapper/rom/sssettingswrapper_stub.sis Binary file cellular/sssettings/xqbindings/sssettingswrapper/rom/sssettingswrapper_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/sssettings/xqbindings/sssettingswrapper/sssettingswrapper.pro --- a/cellular/sssettings/xqbindings/sssettingswrapper/sssettingswrapper.pro Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/sssettings/xqbindings/sssettingswrapper/sssettingswrapper.pro Fri Sep 17 17:09:13 2010 +0300 @@ -34,7 +34,8 @@ TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = CAP_GENERAL_DLL TARGET.UID3 = 0X20029F22 - + VERSION = 10.0 + defFiles = \ "$${LITERAL_HASH}ifdef WINS" \ "DEFFILE bwins/sssettingswrapper.def" \ @@ -51,6 +52,8 @@ BLD_INF_RULES.prj_exports += \ "$${LITERAL_HASH}include " \ "./rom/sssettingswrapper.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sssettingswrapper.iby)" + BLD_INF_RULES.prj_exports += \ + "./rom/sssettingswrapper_stub.sis /epoc32/data/z/system/install/sssettingswrapper_stub.sis" } else: { DESTDIR = c:\hb\lib DLLDESTDIR = c:\hb\bin diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/group/bld.inf --- a/cellular/telephonysettings/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -26,7 +26,7 @@ PRJ_EXPORTS -../group/phonesettings_stub.sis /epoc32/data/z/system/install/phonesettings_stub.sis +../rom/phonesettings_stub.sis /epoc32/data/z/system/install/phonesettings_stub.sis // IBY files ../rom/phonesettings.iby CORE_APP_LAYER_IBY_EXPORT_PATH(phonesettings.iby) diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/group/phonesettings.mmp --- a/cellular/telephonysettings/group/phonesettings.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/group/phonesettings.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -22,6 +22,7 @@ // Capability assignment. CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT +VERSION 10.0 TARGET phonesettings.dll TARGETTYPE dll diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/group/phonesettings.pkg --- a/cellular/telephonysettings/group/phonesettings.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing phonesettings component. -; -; Languages -&EN - -; Header -#{"PhoneSettings"}, (0x100058e3), 10, 1, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -"\epoc32\RELEASE\armv5\UREL\phonesettings.dll"-"z:\sys\bin\phonesettings.dll" diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/group/phonesettings_stub.pkg --- a/cellular/telephonysettings/group/phonesettings_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing phonesettings stub component. -; -; Languages -&EN - -; Header -#{"phonesettings"}, (0x100058e3), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\phonesettings.dll" diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/group/phonesettings_stub.sis Binary file cellular/telephonysettings/group/phonesettings_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/rom/phonesettings.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/rom/phonesettings.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing phonesettings component. +; +; Languages +&EN + +; Header +#{"PhoneSettings"}, (0x100058e3), 10, 1, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +"\epoc32\RELEASE\armv5\UREL\phonesettings.dll"-"z:\sys\bin\phonesettings.dll" diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/rom/phonesettings_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/rom/phonesettings_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing phonesettings stub component. +; +; Languages +&EN + +; Header +#{"phonesettings"}, (0x100058e3), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\phonesettings.dll" diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/rom/phonesettings_stub.sis Binary file cellular/telephonysettings/rom/phonesettings_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/bwins/psetwrapperu.def --- a/cellular/telephonysettings/xqbindings/psetwrapper/bwins/psetwrapperu.def Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/bwins/psetwrapperu.def Fri Sep 17 17:09:13 2010 +0300 @@ -23,8 +23,8 @@ ?availableNetworksGot@PSetNetworkWrapper@@IAEXAAV?$QList@PAUNetworkInfo@PSetNetworkWrapper@@@@@Z @ 22 NONAME ; void PSetNetworkWrapper::availableNetworksGot(class QList &) ?handleCallWaitingChanged@PSetCallWaitingWrapper@@IAEXW4PsCallWaitingCommand@1@H@Z @ 23 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingChanged(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int) ?metaObject@PSetCallDivertingWrapper@@UBEPBUQMetaObject@@XZ @ 24 NONAME ; struct QMetaObject const * PSetCallDivertingWrapper::metaObject(void) const - ?cancelProcess@PSetCallDivertingWrapper@@QAEXXZ @ 25 NONAME ; void PSetCallDivertingWrapper::cancelProcess(void) - ?getCPsetCallDiverting@PSetCallDivertingWrapper@@QBEAAVCPsetCallDiverting@@XZ @ 26 NONAME ; class CPsetCallDiverting & PSetCallDivertingWrapper::getCPsetCallDiverting(void) const + ?getCPsetCallDiverting@PSetCallDivertingWrapper@@QBEAAVCPsetCallDiverting@@XZ @ 25 NONAME ; class CPsetCallDiverting & PSetCallDivertingWrapper::getCPsetCallDiverting(void) const + ?cancelProcess@PSetCallDivertingWrapper@@QAEXXZ @ 26 NONAME ; void PSetCallDivertingWrapper::cancelProcess(void) ?trUtf8@PSetCallWaitingWrapper@@SA?AVQString@@PBD0H@Z @ 27 NONAME ; class QString PSetCallWaitingWrapper::trUtf8(char const *, char const *, int) ?networkChanged@PSetNetworkWrapper@@IAEXAAUNetworkInfo@1@AAW4RegistrationStatus@1@@Z @ 28 NONAME ; void PSetNetworkWrapper::networkChanged(struct PSetNetworkWrapper::NetworkInfo &, enum PSetNetworkWrapper::RegistrationStatus &) ?trUtf8@PSetCallDivertingWrapper@@SA?AVQString@@PBD0H@Z @ 29 NONAME ; class QString PSetCallDivertingWrapper::trUtf8(char const *, char const *, int) @@ -41,17 +41,17 @@ ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *, int) ?handleCallWaitingError@PSetCallWaitingWrapper@@IAEXH@Z @ 41 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingError(int) ?getStaticMetaObject@PSetCallWaitingWrapper@@SAABUQMetaObject@@XZ @ 42 NONAME ; struct QMetaObject const & PSetCallWaitingWrapper::getStaticMetaObject(void) - ?disableBarring@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@VQString@@@Z @ 43 NONAME ; void PSetCallBarringWrapper::disableBarring(class QFlags, enum PSetCallBarringWrapper::BarringType, class QString) - ?tr@PSetWrapper@@SA?AVQString@@PBD0@Z @ 44 NONAME ; class QString PSetWrapper::tr(char const *, char const *) - ??1PSetCliWrapper@@UAE@XZ @ 45 NONAME ; PSetCliWrapper::~PSetCliWrapper(void) - ?getColrMode@PSetCliWrapper@@QAEXXZ @ 46 NONAME ; void PSetCliWrapper::getColrMode(void) - ?qt_metacall@PSetCliWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 47 NONAME ; int PSetCliWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?handleCallWaitingRequesting@PSetCallWaitingWrapper@@IAEX_N0@Z @ 48 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingRequesting(bool, bool) - ?trUtf8@PSetCallBarringWrapper@@SA?AVQString@@PBD0@Z @ 49 NONAME ; class QString PSetCallBarringWrapper::trUtf8(char const *, char const *) - ?barringStatus@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@@Z @ 50 NONAME ; void PSetCallBarringWrapper::barringStatus(class QFlags, enum PSetCallBarringWrapper::BarringType) - ??1PSetWrapper@@UAE@XZ @ 51 NONAME ; PSetWrapper::~PSetWrapper(void) - ?cancelProcess@PSetCallWaitingWrapper@@QAEXXZ @ 52 NONAME ; void PSetCallWaitingWrapper::cancelProcess(void) - ?findPlus@PSetCallDivertingWrapper@@ABE_NABVTDesC16@@@Z @ 53 NONAME ; bool PSetCallDivertingWrapper::findPlus(class TDesC16 const &) const + ?tr@PSetWrapper@@SA?AVQString@@PBD0@Z @ 43 NONAME ; class QString PSetWrapper::tr(char const *, char const *) + ??1PSetCliWrapper@@UAE@XZ @ 44 NONAME ; PSetCliWrapper::~PSetCliWrapper(void) + ?getColrMode@PSetCliWrapper@@QAEXXZ @ 45 NONAME ; void PSetCliWrapper::getColrMode(void) + ?qt_metacall@PSetCliWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 46 NONAME ; int PSetCliWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?handleCallWaitingRequesting@PSetCallWaitingWrapper@@IAEX_N0@Z @ 47 NONAME ; void PSetCallWaitingWrapper::handleCallWaitingRequesting(bool, bool) + ?trUtf8@PSetCallBarringWrapper@@SA?AVQString@@PBD0@Z @ 48 NONAME ; class QString PSetCallBarringWrapper::trUtf8(char const *, char const *) + ?barringStatus@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@@Z @ 49 NONAME ; void PSetCallBarringWrapper::barringStatus(class QFlags, enum PSetCallBarringWrapper::BarringType) + ??1PSetWrapper@@UAE@XZ @ 50 NONAME ; PSetWrapper::~PSetWrapper(void) + ?cancelProcess@PSetCallWaitingWrapper@@QAEXXZ @ 51 NONAME ; void PSetCallWaitingWrapper::cancelProcess(void) + ?findPlus@PSetCallDivertingWrapper@@ABE_NABVTDesC16@@@Z @ 52 NONAME ; bool PSetCallDivertingWrapper::findPlus(class TDesC16 const &) const + ?chageVisbilityOfManualNetworkSelection@PSetNetworkWrapper@@IAEX_N@Z @ 53 NONAME ; void PSetNetworkWrapper::chageVisbilityOfManualNetworkSelection(bool) ??_EPSetCallDivertingWrapper@@UAE@I@Z @ 54 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(unsigned int) ?setCallWaiting@PSetCallWaitingWrapper@@QAEXW4PsCallWaitingCommand@1@H@Z @ 55 NONAME ; void PSetCallWaitingWrapper::setCallWaiting(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int) ??_EPSetCliWrapper@@UAE@I@Z @ 56 NONAME ; PSetCliWrapper::~PSetCliWrapper(unsigned int) @@ -85,51 +85,51 @@ ?queryVoiceMailBoxNumber@PSetCallDivertingWrapper@@QAEHAAVQString@@W4PsService@@@Z @ 84 NONAME ; int PSetCallDivertingWrapper::queryVoiceMailBoxNumber(class QString &, enum PsService) ?qt_metacall@PSetNetworkWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 85 NONAME ; int PSetNetworkWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) ?handleDivertingChanged@PSetCallDivertingWrapper@@IAEXABVPSCallDivertingCommand@@_N@Z @ 86 NONAME ; void PSetCallDivertingWrapper::handleDivertingChanged(class PSCallDivertingCommand const &, bool) - ?cliWrapper@PSetWrapper@@QAEAAVPSetCliWrapper@@XZ @ 87 NONAME ; class PSetCliWrapper & PSetWrapper::cliWrapper(void) - ?handleCliStatus@PSetCliWrapper@@IAEXPAEHABW4PsCallLineIdentity@@@Z @ 88 NONAME ; void PSetCliWrapper::handleCliStatus(unsigned char *, int, enum PsCallLineIdentity const &) - ?getStaticMetaObject@PSetCallBarringWrapper@@SAABUQMetaObject@@XZ @ 89 NONAME ; struct QMetaObject const & PSetCallBarringWrapper::getStaticMetaObject(void) - ?qt_metacall@PSetCallDivertingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 90 NONAME ; int PSetCallDivertingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?changeBarringPassword@PSetCallBarringWrapper@@QAEXABVQString@@00@Z @ 91 NONAME ; void PSetCallBarringWrapper::changeBarringPassword(class QString const &, class QString const &, class QString const &) - ?getNetworkSelectionMode@PSetNetworkWrapper@@QBE?AW4ErrorCode@1@AAW4NetworkSelectionMode@1@@Z @ 92 NONAME ; enum PSetNetworkWrapper::ErrorCode PSetNetworkWrapper::getNetworkSelectionMode(enum PSetNetworkWrapper::NetworkSelectionMode &) const - ?getVoiceMailBoxNumber@PSetCallDivertingWrapper@@QAEHAAVQString@@W4PsService@@@Z @ 93 NONAME ; int PSetCallDivertingWrapper::getVoiceMailBoxNumber(class QString &, enum PsService) - ?tr@PSetNetworkWrapper@@SA?AVQString@@PBD0@Z @ 94 NONAME ; class QString PSetNetworkWrapper::tr(char const *, char const *) - ?staticMetaObject@PSetCallDivertingWrapper@@2UQMetaObject@@B @ 95 NONAME ; struct QMetaObject const PSetCallDivertingWrapper::staticMetaObject - ??0PSetCliWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 96 NONAME ; PSetCliWrapper::PSetCliWrapper(class CPsetContainer &, class QObject *) - ?trUtf8@PSetCliWrapper@@SA?AVQString@@PBD0@Z @ 97 NONAME ; class QString PSetCliWrapper::trUtf8(char const *, char const *) - ??0PSetNetworkWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 98 NONAME ; PSetNetworkWrapper::PSetNetworkWrapper(class CPsetContainer &, class QObject *) - ?qt_metacall@PSetCallWaitingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 99 NONAME ; int PSetCallWaitingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?searchingNetworks@PSetNetworkWrapper@@IAEXAAW4RequestType@1@@Z @ 100 NONAME ; void PSetNetworkWrapper::searchingNetworks(enum PSetNetworkWrapper::RequestType &) - ?getStaticMetaObject@PSetCliWrapper@@SAABUQMetaObject@@XZ @ 101 NONAME ; struct QMetaObject const & PSetCliWrapper::getStaticMetaObject(void) - ?handleDivertingStatus@PSetCallDivertingWrapper@@IAEXAAV?$QList@PAVPSCallDivertingStatus@@@@_N@Z @ 102 NONAME ; void PSetCallDivertingWrapper::handleDivertingStatus(class QList &, bool) - ??1PSetCallDivertingWrapper@@UAE@XZ @ 103 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(void) - ?selectNetwork@PSetNetworkWrapper@@QAEXABUNetworkInfo@1@@Z @ 104 NONAME ; void PSetNetworkWrapper::selectNetwork(struct PSetNetworkWrapper::NetworkInfo const &) - ?handleCliRequesting@PSetCliWrapper@@IAEX_N0@Z @ 105 NONAME ; void PSetCliWrapper::handleCliRequesting(bool, bool) - ?enableBarringRequestCompleted@PSetCallBarringWrapper@@IAEXHW4BarringType@1@W4BarringStatus@1@_N@Z @ 106 NONAME ; void PSetCallBarringWrapper::enableBarringRequestCompleted(int, enum PSetCallBarringWrapper::BarringType, enum PSetCallBarringWrapper::BarringStatus, bool) - ?metaObject@PSetCallWaitingWrapper@@UBEPBUQMetaObject@@XZ @ 107 NONAME ; struct QMetaObject const * PSetCallWaitingWrapper::metaObject(void) const - ?trUtf8@PSetWrapper@@SA?AVQString@@PBD0H@Z @ 108 NONAME ; class QString PSetWrapper::trUtf8(char const *, char const *, int) - ?getCallDivertingStatus@PSetCallDivertingWrapper@@QAEXV?$QFlags@W4PsService@@@@W4PsCallDivertingCondition@@H@Z @ 109 NONAME ; void PSetCallDivertingWrapper::getCallDivertingStatus(class QFlags, enum PsCallDivertingCondition, int) - ?setCallDiverting@PSetCallDivertingWrapper@@QAEHAAVPSCallDivertingCommand@@H@Z @ 110 NONAME ; int PSetCallDivertingWrapper::setCallDiverting(class PSCallDivertingCommand &, int) - ?setNetworkAccessMode@PSetNetworkWrapper@@QAEXW4NetworkAccessMode@1@@Z @ 111 NONAME ; void PSetNetworkWrapper::setNetworkAccessMode(enum PSetNetworkWrapper::NetworkAccessMode) - ??0PSetWrapper@@QAE@PAVQObject@@@Z @ 112 NONAME ; PSetWrapper::PSetWrapper(class QObject *) - ?handleCliError@PSetCliWrapper@@IAEXH@Z @ 113 NONAME ; void PSetCliWrapper::handleCliError(int) - ?handleCFRequesting@PSetCallDivertingWrapper@@IAEX_N0@Z @ 114 NONAME ; void PSetCallDivertingWrapper::handleCFRequesting(bool, bool) - ?cancelAll@PSetCliWrapper@@QAEXXZ @ 115 NONAME ; void PSetCliWrapper::cancelAll(void) - ?networkReqestFailed@PSetNetworkWrapper@@IAEXW4ErrorCode@1@W4RequestType@1@@Z @ 116 NONAME ; void PSetNetworkWrapper::networkReqestFailed(enum PSetNetworkWrapper::ErrorCode, enum PSetNetworkWrapper::RequestType) - ?enableBarring@PSetCallBarringWrapper@@QAEXV?$QFlags@W4PsService@@@@W4BarringType@1@VQString@@@Z @ 117 NONAME ; void PSetCallBarringWrapper::enableBarring(class QFlags, enum PSetCallBarringWrapper::BarringType, class QString) - ?setNewDefaultNumber@PSetCallDivertingWrapper@@QAEXVQString@@@Z @ 118 NONAME ; void PSetCallDivertingWrapper::setNewDefaultNumber(class QString) - ??0PSetCallBarringWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 119 NONAME ; PSetCallBarringWrapper::PSetCallBarringWrapper(class CPsetContainer &, class QObject *) - ?barringStatusRequestCompleted@PSetCallBarringWrapper@@IAEXHABV?$QList@E@@W4BarringStatus@1@@Z @ 120 NONAME ; void PSetCallBarringWrapper::barringStatusRequestCompleted(int, class QList const &, enum PSetCallBarringWrapper::BarringStatus) - ??_EPSetNetworkWrapper@@UAE@I@Z @ 121 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(unsigned int) - ?getCPsetCallWaiting@PSetCallWaitingWrapper@@QBEAAVCPsetCallWaiting@@XZ @ 122 NONAME ; class CPsetCallWaiting & PSetCallWaitingWrapper::getCPsetCallWaiting(void) const - ?getCnap@PSetCliWrapper@@QAEXXZ @ 123 NONAME ; void PSetCliWrapper::getCnap(void) - ??1PSetCallBarringWrapper@@UAE@XZ @ 124 NONAME ; PSetCallBarringWrapper::~PSetCallBarringWrapper(void) - ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0@Z @ 125 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *) - ?getStaticMetaObject@PSetCallDivertingWrapper@@SAABUQMetaObject@@XZ @ 126 NONAME ; struct QMetaObject const & PSetCallDivertingWrapper::getStaticMetaObject(void) - ?metaObject@PSetNetworkWrapper@@UBEPBUQMetaObject@@XZ @ 127 NONAME ; struct QMetaObject const * PSetNetworkWrapper::metaObject(void) const - ??1PSetNetworkWrapper@@UAE@XZ @ 128 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(void) - ?staticMetaObject@PSetNetworkWrapper@@2UQMetaObject@@B @ 129 NONAME ; struct QMetaObject const PSetNetworkWrapper::staticMetaObject - ??_EPSetCallWaitingWrapper@@UAE@I@Z @ 130 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(unsigned int) - ??0PSetCallWaitingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 131 NONAME ; PSetCallWaitingWrapper::PSetCallWaitingWrapper(class CPsetContainer &, class QObject *) - ?qt_metacall@PSetCallBarringWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 132 NONAME ; int PSetCallBarringWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?chageVisbilityOfManualNetworkSelection@PSetNetworkWrapper@@IAEX_N@Z @ 133 NONAME ; void PSetNetworkWrapper::chageVisbilityOfManualNetworkSelection(bool) + ?enableBarring@PSetCallBarringWrapper@@QAEXHV?$QFlags@W4PsService@@@@W4BarringType@1@VQString@@@Z @ 87 NONAME ; void PSetCallBarringWrapper::enableBarring(int, class QFlags, enum PSetCallBarringWrapper::BarringType, class QString) + ?disableBarring@PSetCallBarringWrapper@@QAEXHV?$QFlags@W4PsService@@@@W4BarringType@1@VQString@@@Z @ 88 NONAME ; void PSetCallBarringWrapper::disableBarring(int, class QFlags, enum PSetCallBarringWrapper::BarringType, class QString) + ?cliWrapper@PSetWrapper@@QAEAAVPSetCliWrapper@@XZ @ 89 NONAME ; class PSetCliWrapper & PSetWrapper::cliWrapper(void) + ?handleCliStatus@PSetCliWrapper@@IAEXPAEHABW4PsCallLineIdentity@@@Z @ 90 NONAME ; void PSetCliWrapper::handleCliStatus(unsigned char *, int, enum PsCallLineIdentity const &) + ?getStaticMetaObject@PSetCallBarringWrapper@@SAABUQMetaObject@@XZ @ 91 NONAME ; struct QMetaObject const & PSetCallBarringWrapper::getStaticMetaObject(void) + ?qt_metacall@PSetCallDivertingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 92 NONAME ; int PSetCallDivertingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?changeBarringPassword@PSetCallBarringWrapper@@QAEXABVQString@@00@Z @ 93 NONAME ; void PSetCallBarringWrapper::changeBarringPassword(class QString const &, class QString const &, class QString const &) + ?getNetworkSelectionMode@PSetNetworkWrapper@@QBE?AW4ErrorCode@1@AAW4NetworkSelectionMode@1@@Z @ 94 NONAME ; enum PSetNetworkWrapper::ErrorCode PSetNetworkWrapper::getNetworkSelectionMode(enum PSetNetworkWrapper::NetworkSelectionMode &) const + ?getVoiceMailBoxNumber@PSetCallDivertingWrapper@@QAEHAAVQString@@W4PsService@@@Z @ 95 NONAME ; int PSetCallDivertingWrapper::getVoiceMailBoxNumber(class QString &, enum PsService) + ?tr@PSetNetworkWrapper@@SA?AVQString@@PBD0@Z @ 96 NONAME ; class QString PSetNetworkWrapper::tr(char const *, char const *) + ?staticMetaObject@PSetCallDivertingWrapper@@2UQMetaObject@@B @ 97 NONAME ; struct QMetaObject const PSetCallDivertingWrapper::staticMetaObject + ??0PSetCliWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 98 NONAME ; PSetCliWrapper::PSetCliWrapper(class CPsetContainer &, class QObject *) + ?trUtf8@PSetCliWrapper@@SA?AVQString@@PBD0@Z @ 99 NONAME ; class QString PSetCliWrapper::trUtf8(char const *, char const *) + ??0PSetNetworkWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 100 NONAME ; PSetNetworkWrapper::PSetNetworkWrapper(class CPsetContainer &, class QObject *) + ?qt_metacall@PSetCallWaitingWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 101 NONAME ; int PSetCallWaitingWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?searchingNetworks@PSetNetworkWrapper@@IAEXAAW4RequestType@1@@Z @ 102 NONAME ; void PSetNetworkWrapper::searchingNetworks(enum PSetNetworkWrapper::RequestType &) + ?getStaticMetaObject@PSetCliWrapper@@SAABUQMetaObject@@XZ @ 103 NONAME ; struct QMetaObject const & PSetCliWrapper::getStaticMetaObject(void) + ?handleDivertingStatus@PSetCallDivertingWrapper@@IAEXAAV?$QList@PAVPSCallDivertingStatus@@@@_N@Z @ 104 NONAME ; void PSetCallDivertingWrapper::handleDivertingStatus(class QList &, bool) + ??1PSetCallDivertingWrapper@@UAE@XZ @ 105 NONAME ; PSetCallDivertingWrapper::~PSetCallDivertingWrapper(void) + ?selectNetwork@PSetNetworkWrapper@@QAEXABUNetworkInfo@1@@Z @ 106 NONAME ; void PSetNetworkWrapper::selectNetwork(struct PSetNetworkWrapper::NetworkInfo const &) + ?handleCliRequesting@PSetCliWrapper@@IAEX_N0@Z @ 107 NONAME ; void PSetCliWrapper::handleCliRequesting(bool, bool) + ?enableBarringRequestCompleted@PSetCallBarringWrapper@@IAEXHW4BarringType@1@W4BarringStatus@1@_N@Z @ 108 NONAME ; void PSetCallBarringWrapper::enableBarringRequestCompleted(int, enum PSetCallBarringWrapper::BarringType, enum PSetCallBarringWrapper::BarringStatus, bool) + ?metaObject@PSetCallWaitingWrapper@@UBEPBUQMetaObject@@XZ @ 109 NONAME ; struct QMetaObject const * PSetCallWaitingWrapper::metaObject(void) const + ?trUtf8@PSetWrapper@@SA?AVQString@@PBD0H@Z @ 110 NONAME ; class QString PSetWrapper::trUtf8(char const *, char const *, int) + ?getCallDivertingStatus@PSetCallDivertingWrapper@@QAEXV?$QFlags@W4PsService@@@@W4PsCallDivertingCondition@@H@Z @ 111 NONAME ; void PSetCallDivertingWrapper::getCallDivertingStatus(class QFlags, enum PsCallDivertingCondition, int) + ?setCallDiverting@PSetCallDivertingWrapper@@QAEHAAVPSCallDivertingCommand@@H@Z @ 112 NONAME ; int PSetCallDivertingWrapper::setCallDiverting(class PSCallDivertingCommand &, int) + ?setNetworkAccessMode@PSetNetworkWrapper@@QAEXW4NetworkAccessMode@1@@Z @ 113 NONAME ; void PSetNetworkWrapper::setNetworkAccessMode(enum PSetNetworkWrapper::NetworkAccessMode) + ??0PSetWrapper@@QAE@PAVQObject@@@Z @ 114 NONAME ; PSetWrapper::PSetWrapper(class QObject *) + ?handleCliError@PSetCliWrapper@@IAEXH@Z @ 115 NONAME ; void PSetCliWrapper::handleCliError(int) + ?handleCFRequesting@PSetCallDivertingWrapper@@IAEX_N0@Z @ 116 NONAME ; void PSetCallDivertingWrapper::handleCFRequesting(bool, bool) + ?cancelAll@PSetCliWrapper@@QAEXXZ @ 117 NONAME ; void PSetCliWrapper::cancelAll(void) + ?networkReqestFailed@PSetNetworkWrapper@@IAEXW4ErrorCode@1@W4RequestType@1@@Z @ 118 NONAME ; void PSetNetworkWrapper::networkReqestFailed(enum PSetNetworkWrapper::ErrorCode, enum PSetNetworkWrapper::RequestType) + ?setNewDefaultNumber@PSetCallDivertingWrapper@@QAEXVQString@@@Z @ 119 NONAME ; void PSetCallDivertingWrapper::setNewDefaultNumber(class QString) + ??0PSetCallBarringWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 120 NONAME ; PSetCallBarringWrapper::PSetCallBarringWrapper(class CPsetContainer &, class QObject *) + ?barringStatusRequestCompleted@PSetCallBarringWrapper@@IAEXHABV?$QList@E@@W4BarringStatus@1@@Z @ 121 NONAME ; void PSetCallBarringWrapper::barringStatusRequestCompleted(int, class QList const &, enum PSetCallBarringWrapper::BarringStatus) + ??_EPSetNetworkWrapper@@UAE@I@Z @ 122 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(unsigned int) + ?getCPsetCallWaiting@PSetCallWaitingWrapper@@QBEAAVCPsetCallWaiting@@XZ @ 123 NONAME ; class CPsetCallWaiting & PSetCallWaitingWrapper::getCPsetCallWaiting(void) const + ?getCnap@PSetCliWrapper@@QAEXXZ @ 124 NONAME ; void PSetCliWrapper::getCnap(void) + ??1PSetCallBarringWrapper@@UAE@XZ @ 125 NONAME ; PSetCallBarringWrapper::~PSetCallBarringWrapper(void) + ?tr@PSetCallDivertingWrapper@@SA?AVQString@@PBD0@Z @ 126 NONAME ; class QString PSetCallDivertingWrapper::tr(char const *, char const *) + ?getStaticMetaObject@PSetCallDivertingWrapper@@SAABUQMetaObject@@XZ @ 127 NONAME ; struct QMetaObject const & PSetCallDivertingWrapper::getStaticMetaObject(void) + ?metaObject@PSetNetworkWrapper@@UBEPBUQMetaObject@@XZ @ 128 NONAME ; struct QMetaObject const * PSetNetworkWrapper::metaObject(void) const + ??1PSetNetworkWrapper@@UAE@XZ @ 129 NONAME ; PSetNetworkWrapper::~PSetNetworkWrapper(void) + ?staticMetaObject@PSetNetworkWrapper@@2UQMetaObject@@B @ 130 NONAME ; struct QMetaObject const PSetNetworkWrapper::staticMetaObject + ??_EPSetCallWaitingWrapper@@UAE@I@Z @ 131 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(unsigned int) + ??0PSetCallWaitingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 132 NONAME ; PSetCallWaitingWrapper::PSetCallWaitingWrapper(class CPsetContainer &, class QObject *) + ?qt_metacall@PSetCallBarringWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 133 NONAME ; int PSetCallBarringWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/eabi/psetwrapperu.def --- a/cellular/telephonysettings/xqbindings/psetwrapper/eabi/psetwrapperu.def Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/eabi/psetwrapperu.def Fri Sep 17 17:09:13 2010 +0300 @@ -47,89 +47,89 @@ _ZN18PSetNetworkWrapper20networkAccessModeGotEi @ 46 NONAME _ZN18PSetNetworkWrapper20setNetworkAccessModeENS_17NetworkAccessModeE @ 47 NONAME _ZN18PSetNetworkWrapper25requestingSelectedNetworkEb @ 48 NONAME - _ZN18PSetNetworkWrapperC1ER14CPsetContainerP7QObject @ 49 NONAME - _ZN18PSetNetworkWrapperC2ER14CPsetContainerP7QObject @ 50 NONAME - _ZN18PSetNetworkWrapperD0Ev @ 51 NONAME - _ZN18PSetNetworkWrapperD1Ev @ 52 NONAME - _ZN18PSetNetworkWrapperD2Ev @ 53 NONAME - _ZN22PSetCallBarringWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 54 NONAME - _ZN22PSetCallBarringWrapper11qt_metacastEPKc @ 55 NONAME - _ZN22PSetCallBarringWrapper13barringStatusE6QFlagsI9PsServiceENS_11BarringTypeE @ 56 NONAME - _ZN22PSetCallBarringWrapper13enableBarringE6QFlagsI9PsServiceENS_11BarringTypeE7QString @ 57 NONAME - _ZN22PSetCallBarringWrapper14disableBarringE6QFlagsI9PsServiceENS_11BarringTypeE7QString @ 58 NONAME - _ZN22PSetCallBarringWrapper16staticMetaObjectE @ 59 NONAME DATA 16 - _ZN22PSetCallBarringWrapper19getStaticMetaObjectEv @ 60 NONAME - _ZN22PSetCallBarringWrapper21changeBarringPasswordERK7QStringS2_S2_ @ 61 NONAME - _ZN22PSetCallBarringWrapper29barringStatusRequestCompletedEiRK5QListIhENS_13BarringStatusE @ 62 NONAME - _ZN22PSetCallBarringWrapper29enableBarringRequestCompletedEiNS_11BarringTypeENS_13BarringStatusEb @ 63 NONAME - _ZN22PSetCallBarringWrapper30disableBarringRequestCompletedEiNS_11BarringTypeENS_13BarringStatusEb @ 64 NONAME - _ZN22PSetCallBarringWrapper37barringPasswordChangeRequestCompletedEi @ 65 NONAME - _ZN22PSetCallBarringWrapperC1ER14CPsetContainerP7QObject @ 66 NONAME - _ZN22PSetCallBarringWrapperC2ER14CPsetContainerP7QObject @ 67 NONAME - _ZN22PSetCallBarringWrapperD0Ev @ 68 NONAME - _ZN22PSetCallBarringWrapperD1Ev @ 69 NONAME - _ZN22PSetCallBarringWrapperD2Ev @ 70 NONAME - _ZN22PSetCallWaitingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 71 NONAME - _ZN22PSetCallWaitingWrapper11qt_metacastEPKc @ 72 NONAME - _ZN22PSetCallWaitingWrapper13cancelProcessEv @ 73 NONAME - _ZN22PSetCallWaitingWrapper14setCallWaitingENS_20PsCallWaitingCommandEi @ 74 NONAME - _ZN22PSetCallWaitingWrapper16staticMetaObjectE @ 75 NONAME DATA 16 - _ZN22PSetCallWaitingWrapper19getStaticMetaObjectEv @ 76 NONAME - _ZN22PSetCallWaitingWrapper20getCallWaitingStatusEv @ 77 NONAME - _ZN22PSetCallWaitingWrapper22handleCallWaitingErrorEi @ 78 NONAME - _ZN22PSetCallWaitingWrapper24handleCallWaitingChangedENS_20PsCallWaitingCommandEi @ 79 NONAME - _ZN22PSetCallWaitingWrapper26handleCallWaitingGetStatusENS_19PsCallWaitingStatusERK5QListIhE @ 80 NONAME - _ZN22PSetCallWaitingWrapper27handleCallWaitingRequestingEbb @ 81 NONAME - _ZN22PSetCallWaitingWrapperC1ER14CPsetContainerP7QObject @ 82 NONAME - _ZN22PSetCallWaitingWrapperC2ER14CPsetContainerP7QObject @ 83 NONAME - _ZN22PSetCallWaitingWrapperD0Ev @ 84 NONAME - _ZN22PSetCallWaitingWrapperD1Ev @ 85 NONAME - _ZN22PSetCallWaitingWrapperD2Ev @ 86 NONAME - _ZN24PSetCallDivertingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 87 NONAME - _ZN24PSetCallDivertingWrapper11qt_metacastEPKc @ 88 NONAME - _ZN24PSetCallDivertingWrapper11requestDoneEv @ 89 NONAME - _ZN24PSetCallDivertingWrapper13cancelProcessEv @ 90 NONAME - _ZN24PSetCallDivertingWrapper16setCallDivertingER22PSCallDivertingCommandi @ 91 NONAME - _ZN24PSetCallDivertingWrapper16staticMetaObjectE @ 92 NONAME DATA 16 - _ZN24PSetCallDivertingWrapper17getDefaultNumbersER11QStringList @ 93 NONAME - _ZN24PSetCallDivertingWrapper18handleCFRequestingEbb @ 94 NONAME - _ZN24PSetCallDivertingWrapper19getStaticMetaObjectEv @ 95 NONAME - _ZN24PSetCallDivertingWrapper19setNewDefaultNumberE7QString @ 96 NONAME - _ZN24PSetCallDivertingWrapper20handleDivertingErrorEi @ 97 NONAME - _ZN24PSetCallDivertingWrapper21getVoiceMailBoxNumberER7QString9PsService @ 98 NONAME - _ZN24PSetCallDivertingWrapper21handleDivertingStatusER5QListIP21PSCallDivertingStatusEb @ 99 NONAME - _ZN24PSetCallDivertingWrapper22getCallDivertingStatusE6QFlagsI9PsServiceE24PsCallDivertingConditioni @ 100 NONAME - _ZN24PSetCallDivertingWrapper22handleDivertingChangedERK22PSCallDivertingCommandb @ 101 NONAME - _ZN24PSetCallDivertingWrapper23queryVoiceMailBoxNumberER7QString9PsService @ 102 NONAME - _ZN24PSetCallDivertingWrapperC1ER14CPsetContainerP7QObject @ 103 NONAME - _ZN24PSetCallDivertingWrapperC2ER14CPsetContainerP7QObject @ 104 NONAME - _ZN24PSetCallDivertingWrapperD0Ev @ 105 NONAME - _ZN24PSetCallDivertingWrapperD1Ev @ 106 NONAME - _ZN24PSetCallDivertingWrapperD2Ev @ 107 NONAME - _ZNK11PSetWrapper10metaObjectEv @ 108 NONAME - _ZNK14PSetCliWrapper10metaObjectEv @ 109 NONAME - _ZNK18PSetNetworkWrapper10metaObjectEv @ 110 NONAME - _ZNK18PSetNetworkWrapper20getNetworkAccessModeEv @ 111 NONAME - _ZNK18PSetNetworkWrapper23getNetworkSelectionModeERNS_20NetworkSelectionModeE @ 112 NONAME - _ZNK18PSetNetworkWrapper33isManualNetworkSelectionSupportedEv @ 113 NONAME - _ZNK22PSetCallBarringWrapper10metaObjectEv @ 114 NONAME - _ZNK22PSetCallWaitingWrapper10metaObjectEv @ 115 NONAME - _ZNK22PSetCallWaitingWrapper19getCPsetCallWaitingEv @ 116 NONAME - _ZNK24PSetCallDivertingWrapper10metaObjectEv @ 117 NONAME - _ZNK24PSetCallDivertingWrapper20validateDivertNumberERK7TDesC16 @ 118 NONAME - _ZNK24PSetCallDivertingWrapper21getCPsetCallDivertingEv @ 119 NONAME - _ZNK24PSetCallDivertingWrapper8findPlusERK7TDesC16 @ 120 NONAME - _ZTI11PSetWrapper @ 121 NONAME - _ZTI14PSetCliWrapper @ 122 NONAME - _ZTI18PSetNetworkWrapper @ 123 NONAME - _ZTI22PSetCallBarringWrapper @ 124 NONAME - _ZTI22PSetCallWaitingWrapper @ 125 NONAME - _ZTI24PSetCallDivertingWrapper @ 126 NONAME - _ZTV11PSetWrapper @ 127 NONAME - _ZTV14PSetCliWrapper @ 128 NONAME - _ZTV18PSetNetworkWrapper @ 129 NONAME - _ZTV22PSetCallBarringWrapper @ 130 NONAME - _ZTV22PSetCallWaitingWrapper @ 131 NONAME - _ZTV24PSetCallDivertingWrapper @ 132 NONAME - _ZN18PSetNetworkWrapper38chageVisbilityOfManualNetworkSelectionEb @ 133 NONAME + _ZN18PSetNetworkWrapper38chageVisbilityOfManualNetworkSelectionEb @ 49 NONAME + _ZN18PSetNetworkWrapperC1ER14CPsetContainerP7QObject @ 50 NONAME + _ZN18PSetNetworkWrapperC2ER14CPsetContainerP7QObject @ 51 NONAME + _ZN18PSetNetworkWrapperD0Ev @ 52 NONAME + _ZN18PSetNetworkWrapperD1Ev @ 53 NONAME + _ZN18PSetNetworkWrapperD2Ev @ 54 NONAME + _ZN22PSetCallBarringWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 55 NONAME + _ZN22PSetCallBarringWrapper11qt_metacastEPKc @ 56 NONAME + _ZN22PSetCallBarringWrapper13barringStatusE6QFlagsI9PsServiceENS_11BarringTypeE @ 57 NONAME + _ZN22PSetCallBarringWrapper13enableBarringEi6QFlagsI9PsServiceENS_11BarringTypeE7QString @ 58 NONAME + _ZN22PSetCallBarringWrapper14disableBarringEi6QFlagsI9PsServiceENS_11BarringTypeE7QString @ 59 NONAME + _ZN22PSetCallBarringWrapper16staticMetaObjectE @ 60 NONAME DATA 16 + _ZN22PSetCallBarringWrapper19getStaticMetaObjectEv @ 61 NONAME + _ZN22PSetCallBarringWrapper21changeBarringPasswordERK7QStringS2_S2_ @ 62 NONAME + _ZN22PSetCallBarringWrapper29barringStatusRequestCompletedEiRK5QListIhENS_13BarringStatusE @ 63 NONAME + _ZN22PSetCallBarringWrapper29enableBarringRequestCompletedEiNS_11BarringTypeENS_13BarringStatusEb @ 64 NONAME + _ZN22PSetCallBarringWrapper30disableBarringRequestCompletedEiNS_11BarringTypeENS_13BarringStatusEb @ 65 NONAME + _ZN22PSetCallBarringWrapper37barringPasswordChangeRequestCompletedEi @ 66 NONAME + _ZN22PSetCallBarringWrapperC1ER14CPsetContainerP7QObject @ 67 NONAME + _ZN22PSetCallBarringWrapperC2ER14CPsetContainerP7QObject @ 68 NONAME + _ZN22PSetCallBarringWrapperD0Ev @ 69 NONAME + _ZN22PSetCallBarringWrapperD1Ev @ 70 NONAME + _ZN22PSetCallBarringWrapperD2Ev @ 71 NONAME + _ZN22PSetCallWaitingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 72 NONAME + _ZN22PSetCallWaitingWrapper11qt_metacastEPKc @ 73 NONAME + _ZN22PSetCallWaitingWrapper13cancelProcessEv @ 74 NONAME + _ZN22PSetCallWaitingWrapper14setCallWaitingENS_20PsCallWaitingCommandEi @ 75 NONAME + _ZN22PSetCallWaitingWrapper16staticMetaObjectE @ 76 NONAME DATA 16 + _ZN22PSetCallWaitingWrapper19getStaticMetaObjectEv @ 77 NONAME + _ZN22PSetCallWaitingWrapper20getCallWaitingStatusEv @ 78 NONAME + _ZN22PSetCallWaitingWrapper22handleCallWaitingErrorEi @ 79 NONAME + _ZN22PSetCallWaitingWrapper24handleCallWaitingChangedENS_20PsCallWaitingCommandEi @ 80 NONAME + _ZN22PSetCallWaitingWrapper26handleCallWaitingGetStatusENS_19PsCallWaitingStatusERK5QListIhE @ 81 NONAME + _ZN22PSetCallWaitingWrapper27handleCallWaitingRequestingEbb @ 82 NONAME + _ZN22PSetCallWaitingWrapperC1ER14CPsetContainerP7QObject @ 83 NONAME + _ZN22PSetCallWaitingWrapperC2ER14CPsetContainerP7QObject @ 84 NONAME + _ZN22PSetCallWaitingWrapperD0Ev @ 85 NONAME + _ZN22PSetCallWaitingWrapperD1Ev @ 86 NONAME + _ZN22PSetCallWaitingWrapperD2Ev @ 87 NONAME + _ZN24PSetCallDivertingWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 88 NONAME + _ZN24PSetCallDivertingWrapper11qt_metacastEPKc @ 89 NONAME + _ZN24PSetCallDivertingWrapper11requestDoneEv @ 90 NONAME + _ZN24PSetCallDivertingWrapper13cancelProcessEv @ 91 NONAME + _ZN24PSetCallDivertingWrapper16setCallDivertingER22PSCallDivertingCommandi @ 92 NONAME + _ZN24PSetCallDivertingWrapper16staticMetaObjectE @ 93 NONAME DATA 16 + _ZN24PSetCallDivertingWrapper17getDefaultNumbersER11QStringList @ 94 NONAME + _ZN24PSetCallDivertingWrapper18handleCFRequestingEbb @ 95 NONAME + _ZN24PSetCallDivertingWrapper19getStaticMetaObjectEv @ 96 NONAME + _ZN24PSetCallDivertingWrapper19setNewDefaultNumberE7QString @ 97 NONAME + _ZN24PSetCallDivertingWrapper20handleDivertingErrorEi @ 98 NONAME + _ZN24PSetCallDivertingWrapper21getVoiceMailBoxNumberER7QString9PsService @ 99 NONAME + _ZN24PSetCallDivertingWrapper21handleDivertingStatusER5QListIP21PSCallDivertingStatusEb @ 100 NONAME + _ZN24PSetCallDivertingWrapper22getCallDivertingStatusE6QFlagsI9PsServiceE24PsCallDivertingConditioni @ 101 NONAME + _ZN24PSetCallDivertingWrapper22handleDivertingChangedERK22PSCallDivertingCommandb @ 102 NONAME + _ZN24PSetCallDivertingWrapper23queryVoiceMailBoxNumberER7QString9PsService @ 103 NONAME + _ZN24PSetCallDivertingWrapperC1ER14CPsetContainerP7QObject @ 104 NONAME + _ZN24PSetCallDivertingWrapperC2ER14CPsetContainerP7QObject @ 105 NONAME + _ZN24PSetCallDivertingWrapperD0Ev @ 106 NONAME + _ZN24PSetCallDivertingWrapperD1Ev @ 107 NONAME + _ZN24PSetCallDivertingWrapperD2Ev @ 108 NONAME + _ZNK11PSetWrapper10metaObjectEv @ 109 NONAME + _ZNK14PSetCliWrapper10metaObjectEv @ 110 NONAME + _ZNK18PSetNetworkWrapper10metaObjectEv @ 111 NONAME + _ZNK18PSetNetworkWrapper20getNetworkAccessModeEv @ 112 NONAME + _ZNK18PSetNetworkWrapper23getNetworkSelectionModeERNS_20NetworkSelectionModeE @ 113 NONAME + _ZNK18PSetNetworkWrapper33isManualNetworkSelectionSupportedEv @ 114 NONAME + _ZNK22PSetCallBarringWrapper10metaObjectEv @ 115 NONAME + _ZNK22PSetCallWaitingWrapper10metaObjectEv @ 116 NONAME + _ZNK22PSetCallWaitingWrapper19getCPsetCallWaitingEv @ 117 NONAME + _ZNK24PSetCallDivertingWrapper10metaObjectEv @ 118 NONAME + _ZNK24PSetCallDivertingWrapper20validateDivertNumberERK7TDesC16 @ 119 NONAME + _ZNK24PSetCallDivertingWrapper21getCPsetCallDivertingEv @ 120 NONAME + _ZNK24PSetCallDivertingWrapper8findPlusERK7TDesC16 @ 121 NONAME + _ZTI11PSetWrapper @ 122 NONAME + _ZTI14PSetCliWrapper @ 123 NONAME + _ZTI18PSetNetworkWrapper @ 124 NONAME + _ZTI22PSetCallBarringWrapper @ 125 NONAME + _ZTI22PSetCallWaitingWrapper @ 126 NONAME + _ZTI24PSetCallDivertingWrapper @ 127 NONAME + _ZTV11PSetWrapper @ 128 NONAME + _ZTV14PSetCliWrapper @ 129 NONAME + _ZTV18PSetNetworkWrapper @ 130 NONAME + _ZTV22PSetCallBarringWrapper @ 131 NONAME + _ZTV22PSetCallWaitingWrapper @ 132 NONAME + _ZTV24PSetCallDivertingWrapper @ 133 NONAME diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pro --- a/cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pro Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/psetwrapper.pro Fri Sep 17 17:09:13 2010 +0300 @@ -40,6 +40,7 @@ TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = CAP_GENERAL_DLL TARGET.UID3 = 0X20029F20 + VERSION = 10.0 defFiles = \ "$${LITERAL_HASH}ifdef WINS" \ @@ -57,7 +58,8 @@ BLD_INF_RULES.prj_exports += \ "$${LITERAL_HASH}include " \ "./rom/psetwrapper.iby CORE_MW_LAYER_IBY_EXPORT_PATH(psetwrapper.iby)" - + BLD_INF_RULES.prj_exports += \ + "./rom/psetwrapper_stub.sis /epoc32/data/z/system/install/psetwrapper_stub.sis" } else: { DESTDIR = c:\hb\lib DLLDESTDIR = c:\hb\bin diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/rom/psetwrapper.iby --- a/cellular/telephonysettings/xqbindings/psetwrapper/rom/psetwrapper.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/rom/psetwrapper.iby Fri Sep 17 17:09:13 2010 +0300 @@ -20,6 +20,7 @@ #include -file=ABI_DIR\BUILD_DIR\psetwrapper.dll SHARED_LIB_DIR\psetwrapper.dll +file=ABI_DIR\BUILD_DIR\psetwrapper.dll SHARED_LIB_DIR\psetwrapper.dll +data=ZSYSTEM\install\psetwrapper_stub.sis System\Install\psetwrapper_stub.sis #endif diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/rom/psetwrapper_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/rom/psetwrapper_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 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: For packing phone contact finder stub. +; +; Languages +&EN + + +; SIS header: name, uid, version +#{"psetwrapper"},(0X20029F20),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +"" - "z:\sys\bin\psetwrapper.dll" + diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/rom/psetwrapper_stub.sis Binary file cellular/telephonysettings/xqbindings/psetwrapper/rom/psetwrapper_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -58,26 +58,30 @@ PSetCallBarringWrapper::enableBarring */ void PSetCallBarringWrapper::enableBarring( + int basicServiceGroup, + PsServiceGroup serviceGroup, + BarringType barringType, + QString barringPassword ) +{ + DPRINT; + + m_privateImpl->enableBarring( + basicServiceGroup, serviceGroup, barringType, barringPassword); +} + +/*! + PSetCallBarringWrapper::disableBarring + */ +void PSetCallBarringWrapper::disableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, BarringType barringType, QString barringPassword) { DPRINT; - m_privateImpl->enableBarring(serviceGroup, barringType, barringPassword); -} - -/*! - PSetCallBarringWrapper::disableBarring - */ -void PSetCallBarringWrapper::disableBarring( - PsServiceGroup serviceGroup, - BarringType barringType, - QString barringPassword) -{ - DPRINT; - - m_privateImpl->disableBarring(serviceGroup, barringType, barringPassword); + m_privateImpl->disableBarring( + basicServiceGroup, serviceGroup, barringType, barringPassword); } /*! diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -214,6 +214,7 @@ PSetCallBarringWrapperPrivate::enableBarring */ void PSetCallBarringWrapperPrivate::enableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, PSetCallBarringWrapper::BarringType barringType, QString barringPassword) @@ -226,11 +227,9 @@ setting.iServiceGroup = convertServiceGroup(serviceGroup); setting.iPassword.Copy(barringPassword.utf16()); - TBasicServiceGroups serviceGroups = EAllTeleAndBearer; - m_currentRequest = RequestEnableBarring; - QT_TRAP_THROWING( - m_callBarring->SetBarringL(setting, serviceGroups); + QT_TRAP_THROWING(m_callBarring->SetBarringL( + setting, static_cast(basicServiceGroup)); ) } @@ -239,6 +238,7 @@ PSetCallBarringWrapperPrivate::disableBarring */ void PSetCallBarringWrapperPrivate::disableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, PSetCallBarringWrapper::BarringType barringType, QString barringPassword) @@ -251,12 +251,10 @@ setting.iServiceGroup = convertServiceGroup(serviceGroup); setting.iPassword.Copy(barringPassword.utf16()); - TBasicServiceGroups serviceGroups = EAllTeleAndBearer; - m_currentRequest = RequestDisableBarring; - QT_TRAP_THROWING( - m_callBarring->SetBarringL(setting, serviceGroups); - ) + QT_TRAP_THROWING(m_callBarring->SetBarringL( + setting, static_cast(basicServiceGroup)); + ) } diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.h --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.h Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.h Fri Sep 17 17:09:13 2010 +0300 @@ -55,11 +55,13 @@ PSetCallBarringWrapper::BarringType barringType); void enableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, PSetCallBarringWrapper::BarringType barringType, QString barringPassword); void disableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, PSetCallBarringWrapper::BarringType barringType, QString barringPassword); diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcalldivertingwrapper.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -249,7 +249,7 @@ /*! * PSetCallDivertingWrapper::queryVoiceMailBoxNumber * @param aNumber empty if not set - * @return -1 if not supported + * @return -1 if not supported or an error code */ int PSetCallDivertingWrapper::queryVoiceMailBoxNumber( QString &aNumber, PsService aService) @@ -289,10 +289,12 @@ } else { // New number not given. DPRINT << "New number error: " << error; + ret = error; } } else { // illegal argument DPRINT << "error: " << error; + ret = error; } delete psetVoiceMailboxEntry; // Entry ownership was transferred diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallbarringwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallbarringwrapper.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/mocks/mock_psetcallbarringwrapper.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -73,11 +73,14 @@ // ----------------------------------------------------------------------------- // void PSetCallBarringWrapper::enableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, BarringType barringType, QString barringPassword) { - SMC_MOCK_METHOD3( void, int/*PsServiceGroup*/, static_cast(serviceGroup), + SMC_MOCK_METHOD4( void, + int, basicServiceGroup, + int/*PsServiceGroup*/, static_cast(serviceGroup), BarringType, barringType, QString, barringPassword ) } @@ -87,11 +90,14 @@ // ----------------------------------------------------------------------------- // void PSetCallBarringWrapper::disableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, BarringType barringType, QString barringPassword) { - SMC_MOCK_METHOD3( void, int/*PsServiceGroup*/, static_cast(serviceGroup), + SMC_MOCK_METHOD4( void, + int, basicServiceGroup, + int/*PsServiceGroup*/, static_cast(serviceGroup), BarringType, barringType, QString, barringPassword ) } diff -r 2fa1fa551b0b -r 78df25012fda cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.cpp --- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcallbarringwrapper/ut_psetcallbarringwrapper.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -262,6 +262,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllBarrings, QString("1234")); @@ -270,6 +271,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllOutgoing, QString("1234")); @@ -278,6 +280,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeOutgoingInternational, QString("1234")); @@ -286,6 +289,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry, QString("1234")); @@ -294,6 +298,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllIncoming, QString("1234")); @@ -302,6 +307,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming, QString("1234")); @@ -310,6 +316,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllServices, QString("1234")); @@ -318,6 +325,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllOutgoingServices, QString("1234")); @@ -326,6 +334,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllIncomingServices, QString("1234")); @@ -335,6 +344,7 @@ .willOnce(invokeWithoutArguments(simulateLeaveL)); EXPECT_EXCEPTION( m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllIncomingServices, QString("1234")); @@ -358,6 +368,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllBarrings, QString("1234")); @@ -366,6 +377,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllOutgoing, QString("1234")); @@ -374,6 +386,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeOutgoingInternational, QString("1234")); @@ -382,6 +395,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry, QString("1234")); @@ -390,6 +404,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllIncoming, QString("1234")); @@ -398,6 +413,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming, QString("1234")); @@ -406,6 +422,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllServices, QString("1234")); @@ -414,6 +431,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllOutgoingServices, QString("1234")); @@ -422,6 +440,7 @@ EXPECT(CPsetCallBarring, SetBarringL) .with(setting, EAllTeleAndBearer); m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllIncomingServices, QString("1234")); @@ -431,6 +450,7 @@ .willOnce(invokeWithoutArguments(simulateLeaveL)); EXPECT_EXCEPTION( m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllIncomingServices, QString("1234")); @@ -702,6 +722,7 @@ TCallBarringSetting setting; m_wrapper->enableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllBarrings, QString("1234")); @@ -741,6 +762,7 @@ TCallBarringSetting setting; m_wrapper->disableBarring( + EAllTeleAndBearer, ServiceGroupVoice, PSetCallBarringWrapper::BarringTypeAllBarrings, QString("1234")); diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/callprovider/data/callprovider_stub.pkg --- a/convergedcallengine/callprovider/data/callprovider_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing callprovider stub. -; -; Languages -&EN - -; Header -#{"callprovider"}, (0x10207903), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\callprovider.dll" diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/callprovider/data/callprovider_stub.sis Binary file convergedcallengine/callprovider/data/callprovider_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/callprovider/group/bld.inf --- a/convergedcallengine/callprovider/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/callprovider/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -26,7 +26,7 @@ // IBY files ../rom/callprovider.iby CORE_MW_LAYER_IBY_EXPORT_PATH(callprovider.iby) -../data/callprovider_stub.sis /epoc32/data/z/system/install/callprovider_stub.sis +../rom/callprovider_stub.sis /epoc32/data/z/system/install/callprovider_stub.sis PRJ_MMPFILES callprovider.mmp diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/callprovider/group/callprovider.mmp --- a/convergedcallengine/callprovider/group/callprovider.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/callprovider/group/callprovider.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -23,6 +23,8 @@ // Assign Vendor ID. VENDORID VID_DEFAULT +VERSION 10.0 + TARGET callprovider.dll TARGETTYPE dll UID 0x1000008d 0x10207903 diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/callprovider/rom/callprovider_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/convergedcallengine/callprovider/rom/callprovider_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing callprovider stub. +; +; Languages +&EN + +; Header +#{"callprovider"}, (0x10207903), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\callprovider.dll" diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/callprovider/rom/callprovider_stub.sis Binary file convergedcallengine/callprovider/rom/callprovider_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cce/group/bld.inf --- a/convergedcallengine/cce/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/cce/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -24,6 +24,7 @@ DEFAULT PRJ_EXPORTS +../rom/cce_stub.sis /epoc32/data/z/system/install/cce_stub.sis #if defined CORE_MW_LAYER_IBY_EXPORT_PATH ../rom/cce.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cce.iby) diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cce/group/cce.mmp --- a/convergedcallengine/cce/group/cce.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/cce/group/cce.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -23,6 +23,7 @@ TARGETTYPE DLL UID 0x1000008D 0x102828BA VENDORID VID_DEFAULT +VERSION 10.0 SOURCEPATH ../src diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cce/rom/cce.iby --- a/convergedcallengine/cce/rom/cce.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/cce/rom/cce.iby Fri Sep 17 17:09:13 2010 +0300 @@ -19,7 +19,8 @@ #ifndef CCE_IBY #define CCE_IBY -file=ABI_DIR\BUILD_DIR\cce.dll SHARED_LIB_DIR\cce.dll +file=ABI_DIR\BUILD_DIR\cce.dll SHARED_LIB_DIR\cce.dll +data=ZSYSTEM\install\cce_stub.sis System\Install\cce_stub.sis #endif // CCE_IBY diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cce/rom/cce_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/convergedcallengine/cce/rom/cce_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing callprovider stub. +; +; Languages +&EN + +; Header +#{"cce"}, (0x102828BA), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\cce.dll" diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cce/rom/cce_stub.sis Binary file convergedcallengine/cce/rom/cce_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cenrepdatabase/group/bld.inf --- a/convergedcallengine/cenrepdatabase/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/cenrepdatabase/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -21,6 +21,8 @@ DEFAULT PRJ_EXPORTS +../rom/cenrepdatabase_stub.sis /epoc32/data/z/system/install/cenrepdatabase_stub.sis + #if defined CORE_MW_LAYER_IBY_EXPORT_PATH ../rom/cenrepdatabase.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cenrepdatabase.iby) #endif // CORE_MW_LAYER_IBY_EXPORT_PATH diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cenrepdatabase/group/cenrepdatabase.mmp --- a/convergedcallengine/cenrepdatabase/group/cenrepdatabase.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/cenrepdatabase/group/cenrepdatabase.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -24,6 +24,7 @@ TARGETTYPE DLL UID 0x1000008d 0x200159D1 +VERSION 10.0 CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cenrepdatabase/rom/cenrepdatabase.iby --- a/convergedcallengine/cenrepdatabase/rom/cenrepdatabase.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/cenrepdatabase/rom/cenrepdatabase.iby Fri Sep 17 17:09:13 2010 +0300 @@ -18,7 +18,8 @@ #ifndef CENREPDATABASE_IBY #define CENREPDATABASE_IBY -file=ABI_DIR\BUILD_DIR\cenrepdatabase.dll SHARED_LIB_DIR\cenrepdatabase.dll +file=ABI_DIR\BUILD_DIR\cenrepdatabase.dll SHARED_LIB_DIR\cenrepdatabase.dll +data=ZSYSTEM\install\cenrepdatabase_stub.sis System\Install\cenrepdatabase_stub.sis #endif // CENREPDATABASE_IBY diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cenrepdatabase/rom/cenrepdatabase_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/convergedcallengine/cenrepdatabase/rom/cenrepdatabase_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing callprovider stub. +; +; Languages +&EN + +; Header +#{"cenrepdatabase"}, (0x200159D1), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\cenrepdatabase.dll" diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/cenrepdatabase/rom/cenrepdatabase_stub.sis Binary file convergedcallengine/cenrepdatabase/rom/cenrepdatabase_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/serviceselector/group/bld.inf --- a/convergedcallengine/serviceselector/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/serviceselector/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -34,7 +34,7 @@ ../rom/serviceselectorresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(serviceselectorresources.iby) // Stub sis file -../srcdata/serviceselector_stub.sis /epoc32/data/z/system/install/serviceselector_stub.sis +../rom/serviceselector_stub.sis /epoc32/data/z/system/install/serviceselector_stub.sis PRJ_MMPFILES serviceselector.mmp diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/serviceselector/group/serviceselector.mmp --- a/convergedcallengine/serviceselector/group/serviceselector.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/serviceselector/group/serviceselector.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -23,7 +23,7 @@ TARGETTYPE dll UID 0x1000008d 0x20019532 VENDORID VID_DEFAULT - +VERSION 10.0 CAPABILITY CAP_GENERAL_DLL SOURCEPATH ../src diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/serviceselector/rom/serviceselector.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/convergedcallengine/serviceselector/rom/serviceselector.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; Copyright (c) 2009 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: For packing service handling. +; +; servicehandling_stub.pkg + +; Languages +&EN + +; Header +#{"servicehandling"},(0x20019532),1,0,0,TYPE=SA, RU + +;Localised Vendor name +%{"Nokia"} + +;Unique Vendor name +:"Nokia" + +; Target + +"\epoc32\RELEASE\armv5\UREL\serviceselector.dll"-"!:\sys\bin\serviceselector.dll" +"\epoc32\data\z\resource\serviceselector.rsc"-"!:\resource\serviceselector.rsc" \ No newline at end of file diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/serviceselector/rom/serviceselector_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/convergedcallengine/serviceselector/rom/serviceselector_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,33 @@ +; +; Copyright (c) 2009 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: For packing service selector stub. +; +; servicehandling_stub.pkg + +; Languages +&EN + +; Header +#{"servicehandling"},(0x20019532),1,0,0,TYPE=SA + +;Localised Vendor name +%{"Nokia"} + +;Unique Vendor name +:"Nokia" + +; Target + +""-"z:\sys\bin\serviceselector.dll" +""-"z:\resource\serviceselector.rsc" \ No newline at end of file diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/serviceselector/rom/serviceselector_stub.sis Binary file convergedcallengine/serviceselector/rom/serviceselector_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/serviceselector/srcdata/serviceselector.pkg --- a/convergedcallengine/serviceselector/srcdata/serviceselector.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -; -; Copyright (c) 2009 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: For packing service handling. -; -; servicehandling_stub.pkg - -; Languages -&EN - -; Header -#{"servicehandling"},(0x20019532),1,0,0,TYPE=SA, RU - -;Localised Vendor name -%{"Nokia"} - -;Unique Vendor name -:"Nokia" - -; Target - -"\epoc32\RELEASE\armv5\UREL\serviceselector.dll"-"!:\sys\bin\serviceselector.dll" -"\epoc32\data\z\resource\serviceselector.rsc"-"!:\resource\serviceselector.rsc" \ No newline at end of file diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/serviceselector/srcdata/serviceselector_stub.pkg --- a/convergedcallengine/serviceselector/srcdata/serviceselector_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -; -; Copyright (c) 2009 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: For packing service selector stub. -; -; servicehandling_stub.pkg - -; Languages -&EN - -; Header -#{"servicehandling"},(0x20019532),1,0,0,TYPE=SA - -;Localised Vendor name -%{"Nokia"} - -;Unique Vendor name -:"Nokia" - -; Target - -""-"z:\sys\bin\serviceselector.dll" -""-"z:\resource\serviceselector.rsc" \ No newline at end of file diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/serviceselector/srcdata/serviceselector_stub.sis Binary file convergedcallengine/serviceselector/srcdata/serviceselector_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/backuphelper/data/spsbackuphelper_stub.pkg --- a/convergedcallengine/spsettings/backuphelper/data/spsbackuphelper_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: -; -; Languages -&EN - -; Header -#{"spsbackuphelper"}, (0x200286D2), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\spsbackuphelper.exe" diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/backuphelper/data/spsbackuphelper_stub.sis Binary file convergedcallengine/spsettings/backuphelper/data/spsbackuphelper_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/backuphelper/group/bld.inf --- a/convergedcallengine/spsettings/backuphelper/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/spsettings/backuphelper/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -22,7 +22,7 @@ ../data/backup_registration.xml z:/private/200286d2/backup_registration.xml // Stub files -../data/spsbackuphelper_stub.sis /epoc32/data/z/system/install/spsbackuphelper_stub.sis +../rom/spsbackuphelper_stub.sis /epoc32/data/z/system/install/spsbackuphelper_stub.sis PRJ_MMPFILES spsbackuphelper.mmp diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/backuphelper/group/spsbackuphelper.mmp --- a/convergedcallengine/spsettings/backuphelper/group/spsbackuphelper.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/spsettings/backuphelper/group/spsbackuphelper.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -17,10 +17,11 @@ #include -TARGET spsbackuphelper.exe -TARGETTYPE exe -UID 0x100039CE 0x200286D2 -CAPABILITY WriteDeviceData ReadDeviceData +TARGET spsbackuphelper.exe +TARGETTYPE exe +UID 0x100039CE 0x200286D2 +CAPABILITY WriteDeviceData ReadDeviceData +VERSION 10.0 MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/connect diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/backuphelper/rom/spsbackuphelper_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/convergedcallengine/spsettings/backuphelper/rom/spsbackuphelper_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: +; +; Languages +&EN + +; Header +#{"spsbackuphelper"}, (0x200286D2), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\spsbackuphelper.exe" diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/backuphelper/rom/spsbackuphelper_stub.sis Binary file convergedcallengine/spsettings/backuphelper/rom/spsbackuphelper_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/group/bld.inf --- a/convergedcallengine/spsettings/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/spsettings/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -21,9 +21,9 @@ DEFAULT PRJ_EXPORTS +../rom/spsettings_stub.sis /epoc32/data/z/system/install/spsettings_stub.sis // Public headers - ../data/backup_registration.xml z:/private/10282e7e/backup_registration.xml #if defined CORE_MW_LAYER_IBY_EXPORT_PATH @@ -31,8 +31,8 @@ #endif // CORE_MW_LAYER_IBY_EXPORT_PATH // Generic configuration interface for component cenrep settings -../conf/spsettings.confml MW_LAYER_CONFML(spsettings.confml) -../conf/spsettings_10282E7F.crml MW_LAYER_CRML(spsettings_10282E7F.crml) +../conf/spsettings.confml MW_LAYER_CONFML(spsettings.confml) +../conf/spsettings_10282E7F.crml MW_LAYER_CRML(spsettings_10282E7F.crml) PRJ_MMPFILES serviceprovidersettings.mmp diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/group/serviceprovidersettings.mmp --- a/convergedcallengine/spsettings/group/serviceprovidersettings.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/spsettings/group/serviceprovidersettings.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -24,6 +24,7 @@ TARGETTYPE DLL UID 0x1000008d 0x10282E7E +VERSION 10.0 CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/rom/spsettings.iby --- a/convergedcallengine/spsettings/rom/spsettings.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/convergedcallengine/spsettings/rom/spsettings.iby Fri Sep 17 17:09:13 2010 +0300 @@ -18,11 +18,12 @@ #ifndef SPSETTINGS_IBY #define SPSETTINGS_IBY -file=ABI_DIR\BUILD_DIR\spsbackuphelper.exe PROGRAMS_DIR\spsbackuphelper.exe +file=ABI_DIR\BUILD_DIR\spsbackuphelper.exe PROGRAMS_DIR\spsbackuphelper.exe file=ABI_DIR\BUILD_DIR\serviceprovidersettings.dll SHARED_LIB_DIR\serviceprovidersettings.dll -data=ZPRIVATE\10282E7E\backup_registration.xml private\10282E7E\backup_registration.xml -data=ZPRIVATE\200286D2\backup_registration.xml private\200286D2\backup_registration.xml -data=ZSYSTEM\install\spsbackuphelper_stub.sis System\Install\spsbackuphelper_stub.sis +data=ZPRIVATE\10282E7E\backup_registration.xml private\10282E7E\backup_registration.xml +data=ZPRIVATE\200286D2\backup_registration.xml private\200286D2\backup_registration.xml +data=ZSYSTEM\install\spsbackuphelper_stub.sis System\Install\spsbackuphelper_stub.sis +data=ZSYSTEM\install\spsettings_stub.sis System\Install\spsettings_stub.sis #endif // SPSETTINGS_IBY diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/rom/spsettings_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/convergedcallengine/spsettings/rom/spsettings_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; Copyright (c) 2009 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: For packing service selector stub. +; +; servicehandling_stub.pkg + +; Languages +&EN + +; Header +#{"serviceprovidersettings"},(0x10282E7E),1,0,0,TYPE=SA + +;Localised Vendor name +%{"Nokia"} + +;Unique Vendor name +:"Nokia" + +; Target + +""-"z:\sys\bin\serviceprovidersettings.dll" \ No newline at end of file diff -r 2fa1fa551b0b -r 78df25012fda convergedcallengine/spsettings/rom/spsettings_stub.sis Binary file convergedcallengine/spsettings/rom/spsettings_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/aiwdialdata/group/aiwdialdata.mmp --- a/phoneclientserver/aiwdialdata/group/aiwdialdata.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/aiwdialdata/group/aiwdialdata.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -22,6 +22,7 @@ CAPABILITY CAP_GENERAL_DLL // Assign Vendor ID. VENDORID VID_DEFAULT +VERSION 10.0 TARGET aiwdialdata.dll TARGETTYPE dll diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/aiwdialdata/group/aiwdialdata.pkg --- a/phoneclientserver/aiwdialdata/group/aiwdialdata.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing aiwdialdata component. -; -; Languages -&EN - -; Header -#{"aiwdialdata"}, (0x102828ab), 10, 1, 0, TYPE=PU - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -"\epoc32\RELEASE\armv5\UREL\aiwdialdata.dll"-"z:\sys\bin\aiwdialdata.dll" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/aiwdialdata/group/aiwdialdata_stub.pkg --- a/phoneclientserver/aiwdialdata/group/aiwdialdata_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing aiwdialdata stub component. -; -; Languages -&EN - -; Header -#{"aiwdialdata"}, (0x102828ab), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\aiwdialdata.dll" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/aiwdialdata/group/aiwdialdata_stub.sis Binary file phoneclientserver/aiwdialdata/group/aiwdialdata_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/aiwdialdata/group/bld.inf --- a/phoneclientserver/aiwdialdata/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/aiwdialdata/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -24,7 +24,7 @@ ../inc/aiwinternaldialdata.h |../../../inc/aiwinternaldialdata.h -../group/aiwdialdata_stub.sis\ +../rom/aiwdialdata_stub.sis\ /epoc32/data/z/system/install/aiwdialdata_stub.sis // IBY files diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/aiwdialdata/rom/aiwdialdata.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneclientserver/aiwdialdata/rom/aiwdialdata.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing aiwdialdata component. +; +; Languages +&EN + +; Header +#{"aiwdialdata"}, (0x102828ab), 10, 1, 0, TYPE=PU + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +"\epoc32\RELEASE\armv5\UREL\aiwdialdata.dll"-"z:\sys\bin\aiwdialdata.dll" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/aiwdialdata/rom/aiwdialdata_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneclientserver/aiwdialdata/rom/aiwdialdata_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing aiwdialdata stub component. +; +; Languages +&EN + +; Header +#{"aiwdialdata"}, (0x102828ab), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\aiwdialdata.dll" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/aiwdialdata/rom/aiwdialdata_stub.sis Binary file phoneclientserver/aiwdialdata/rom/aiwdialdata_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/callui/group/bld.inf --- a/phoneclientserver/callui/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/callui/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -31,7 +31,7 @@ // Internal ../inc/caui.hrh |../../../inc/caui.hrh -../group/callui_stub.sis /epoc32/data/z/system/install/callui_stub.sis +../rom/callui_stub.sis /epoc32/data/z/system/install/callui_stub.sis // LOC files ../loc/callui.loc MW_LAYER_LOC_EXPORT_PATH(callui.loc) diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/callui/group/callui_stub.pkg --- a/phoneclientserver/callui/group/callui_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -; -; Copyright (c) 2009 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: For packing CalUi component. -; -; Languages -&EN - -; Header -#{"CallUI"}, (0x101F868F), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\CaUiEngine.dll" -""-"z:\sys\bin\CaUiPlugin.dll" -""-"z:\resource\CallUI.rsc" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/callui/group/callui_stub.sis Binary file phoneclientserver/callui/group/callui_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/callui/group/cauiengine.mmp --- a/phoneclientserver/callui/group/cauiengine.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/callui/group/cauiengine.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -25,6 +25,7 @@ TARGET cauiengine.dll TARGETTYPE dll UID 0x1000008d 0x101F868F +VERSION 10.0 SOURCEPATH ../src/cauiengine SOURCE cauiengfactimpl.cpp diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/callui/group/cauiplugin.mmp --- a/phoneclientserver/callui/group/cauiplugin.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/callui/group/cauiplugin.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -26,6 +26,8 @@ UID 0x10009D8D 0x101F868E +VERSION 10.0 + SOURCEPATH ../src/cauiplugin SOURCE cauiplugin.cpp SOURCE cauimain.cpp diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/callui/rom/callui_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneclientserver/callui/rom/callui_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; Copyright (c) 2009 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: For packing CalUi component. +; +; Languages +&EN + +; Header +#{"CallUI"}, (0x101F868F), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\CaUiEngine.dll" +""-"z:\sys\bin\CaUiPlugin.dll" +""-"z:\resource\CallUI.rsc" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/callui/rom/callui_stub.sis Binary file phoneclientserver/callui/rom/callui_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/callui/rom/callui_variant.iby --- a/phoneclientserver/callui/rom/callui_variant.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/callui/rom/callui_variant.iby Fri Sep 17 17:09:13 2010 +0300 @@ -20,7 +20,8 @@ #define __CALLUI_VARIANT_IBY__ #ifdef __JAPAN_PREFIX_CHANGE -file=ABI_DIR\BUILD_DIR\dialutils.dll SHARED_LIB_DIR\dialutils.dll +file=ABI_DIR\BUILD_DIR\dialutils.dll SHARED_LIB_DIR\dialutils.dll +data=ZSYSTEM\install\dialutils_stub.sis System\Install\dialutils_stub.sis #endif // __JAPAN_PREFIX_CHANGE #endif diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/dialutils/group/bld.inf --- a/phoneclientserver/dialutils/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/dialutils/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -24,7 +24,7 @@ PRJ_EXPORTS // Domain -../group/dialutils_stub.sis /epoc32/data/z/system/install/dialutils_stub.sis +../rom/dialutils_stub.sis /epoc32/data/z/system/install/dialutils_stub.sis PRJ_MMPFILES ../group/dialutils.mmp diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/dialutils/group/dialutils.mmp --- a/phoneclientserver/dialutils/group/dialutils.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/dialutils/group/dialutils.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -22,6 +22,7 @@ TARGET dialutils.dll TARGETTYPE dll UID 0x1000008d 0x101F8747 +VERSION 10.0 SOURCEPATH ../src SOURCE dialutilsimpl.cpp diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/dialutils/group/dialutils_stub.pkg --- a/phoneclientserver/dialutils/group/dialutils_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -; -; Copyright (c) 2009 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: For packing DialUtils stub component. -; -; Languages -&EN - -; Header -#{"DialUtils"}, (0x101F8747), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\DialUtils.dll" - diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/dialutils/group/dialutils_stub.sis Binary file phoneclientserver/dialutils/group/dialutils_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/dialutils/rom/dialutils_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneclientserver/dialutils/rom/dialutils_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 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: For packing DialUtils stub component. +; +; Languages +&EN + +; Header +#{"DialUtils"}, (0x101F8747), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\DialUtils.dll" + diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/dialutils/rom/dialutils_stub.sis Binary file phoneclientserver/dialutils/rom/dialutils_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/group/bld.inf --- a/phoneclientserver/enpolicy/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/enpolicy/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -24,9 +24,9 @@ ../inc/cemergencynumberpolicy.h |../../../inc/cemergencynumberpolicy.h #ifdef __EN_POLICY_DOS -dosenpolicy_stub.sis /epoc32/data/z/system/install/dosenpolicy_stub.sis +../rom/dosenpolicy_stub.sis /epoc32/data/z/system/install/dosenpolicy_stub.sis #else -sosenpolicy_stub.sis /epoc32/data/z/system/install/sosenpolicy_stub.sis +../rom/sosenpolicy_stub.sis /epoc32/data/z/system/install/sosenpolicy_stub.sis #endif // IBY files diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/group/dosenpolicy.mmp --- a/phoneclientserver/enpolicy/group/dosenpolicy.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/enpolicy/group/dosenpolicy.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -26,6 +26,7 @@ TARGET dosenpolicy.dll TARGETTYPE DLL UID 0x101F86D1 0x101F86D2 +VERSION 10.0 SOURCEPATH ../src/dosenpolicy SOURCE cdosemergencynumberpolicy.cpp diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/group/dosenpolicy_stub.pkg --- a/phoneclientserver/enpolicy/group/dosenpolicy_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -; -; Copyright (c) 2009 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: For packing dosenpolicy stub component. -; -; Languages -&EN - -; Header -#{"DosEnPolicy"}, (0x101F86D2), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\DosEnPolicy.dll" - - diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/group/dosenpolicy_stub.sis Binary file phoneclientserver/enpolicy/group/dosenpolicy_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/group/sosenpolicy.mmp --- a/phoneclientserver/enpolicy/group/sosenpolicy.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/enpolicy/group/sosenpolicy.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -26,6 +26,7 @@ TARGET sosenpolicy.dll TARGETTYPE DLL UID 0x101F86D1 0x101F86D3 +VERSION 10.0 SOURCEPATH ../src/sosenpolicy SOURCE csosemergencynumberpolicymanager.cpp diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/group/sosenpolicy_stub.pkg --- a/phoneclientserver/enpolicy/group/sosenpolicy_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -; -; Copyright (c) 2009 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: For packing SosEnPolicy stub component. -; -; Languages -&EN - -; Header -#{"SosEnPolicy"}, (0x101F86D3), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\SosEnPolicy.dll" - - diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/group/sosenpolicy_stub.sis Binary file phoneclientserver/enpolicy/group/sosenpolicy_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/rom/dosenpolicy_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneclientserver/enpolicy/rom/dosenpolicy_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; Copyright (c) 2009 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: For packing dosenpolicy stub component. +; +; Languages +&EN + +; Header +#{"DosEnPolicy"}, (0x101F86D2), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\DosEnPolicy.dll" + + diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/rom/dosenpolicy_stub.sis Binary file phoneclientserver/enpolicy/rom/dosenpolicy_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/rom/sosenpolicy_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneclientserver/enpolicy/rom/sosenpolicy_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,31 @@ +; +; Copyright (c) 2009 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: For packing SosEnPolicy stub component. +; +; Languages +&EN + +; Header +#{"SosEnPolicy"}, (0x101F86D3), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\SosEnPolicy.dll" + + diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/enpolicy/rom/sosenpolicy_stub.sis Binary file phoneclientserver/enpolicy/rom/sosenpolicy_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneclient/data/phoneclient_stub.pkg --- a/phoneclientserver/phoneclient/data/phoneclient_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -; -; Copyright (c) 2009 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: For packing phoneclient stub. -; -; Languages -&EN - -; Header -#{"PhoneClient"}, (0x1000084F), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\PhoneClient.dll" -""-"z:\resource\PhoneClient.rsc" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneclient/data/phoneclient_stub.sis Binary file phoneclientserver/phoneclient/data/phoneclient_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneclient/group/bld.inf --- a/phoneclientserver/phoneclient/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/phoneclient/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -31,7 +31,7 @@ ../inc/extcallwrapper/extcallwrapper_aiw/cphcltextphonebase.h |../../inc/cphcltextphonebase.h ../inc/extcallwrapper/extcallwrapper_aiw/cphcltdialer.h |../../inc/cphcltdialer.h -../data/phoneclient_stub.sis /epoc32/data/z/system/install/phoneclient_stub.sis +../rom/phoneclient_stub.sis /epoc32/data/z/system/install/phoneclient_stub.sis // IBY files ../rom/phoneclient.iby CORE_MW_LAYER_IBY_EXPORT_PATH(phoneclient.iby) diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneclient/group/phoneclient.mmp --- a/phoneclientserver/phoneclient/group/phoneclient.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/phoneclient/group/phoneclient.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -27,6 +27,7 @@ TARGET phoneclient.dll TARGETTYPE dll UID 0x1000008d 0x1000084F +VERSION 10.0 SOURCEPATH ../src/notifier/notifier_aiw SOURCE cphcltcallnotify.cpp diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneclient/rom/phoneclient_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneclientserver/phoneclient/rom/phoneclient_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 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: For packing phoneclient stub. +; +; Languages +&EN + +; Header +#{"PhoneClient"}, (0x1000084F), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\PhoneClient.dll" +""-"z:\resource\PhoneClient.rsc" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneclient/rom/phoneclient_stub.sis Binary file phoneclientserver/phoneclient/rom/phoneclient_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneserver/group/bld.inf --- a/phoneclientserver/phoneserver/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/phoneserver/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -25,7 +25,7 @@ backup_registration.xml z:/private/10000850/backup_registration.xml -phoneserver_stub.sis /epoc32/data/z/system/install/phoneserver_stub.sis +../rom/phoneserver_stub.sis /epoc32/data/z/system/install/phoneserver_stub.sis // IBY files ../rom/phoneserver.iby CORE_MW_LAYER_IBY_EXPORT_PATH(phoneserver.iby) diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneserver/group/phoneserver.mmp --- a/phoneclientserver/phoneserver/group/phoneserver.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/phoneserver/group/phoneserver.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -23,6 +23,7 @@ CAPABILITY CAP_SERVER NetworkControl // Assign Vendor ID. VENDORID VID_DEFAULT +VERSION 10.0 TARGET phoneserver.exe EPOCSTACKSIZE 0x5000 diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneserver/group/phoneserver_stub.pkg --- a/phoneclientserver/phoneserver/group/phoneserver_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -; -; Copyright (c) 2009 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: For packing phoneserver stub. -; -; Languages -&EN - -; Header -#{"PhoneServer"}, (0x10000850), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\PhoneServer.exe" -""-"z:\resource\PhoneServer.rsc" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneserver/group/phoneserver_stub.sis Binary file phoneclientserver/phoneserver/group/phoneserver_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneserver/inc/ussd/cphsrvussdmanager.h --- a/phoneclientserver/phoneserver/inc/ussd/cphsrvussdmanager.h Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/phoneserver/inc/ussd/cphsrvussdmanager.h Fri Sep 17 17:09:13 2010 +0300 @@ -76,7 +76,19 @@ */ void ConstructL( MPhSrvPhoneInterface& aPhoneInterface ); - + private: + /* + * TDialogInfoType is used to identify dialogs with different + * buttons. + */ + enum TDialogInfoType{ + EInvalidType = -1, + EYesNo, + ENextExit, + EReplyExit, + EOnlyExit + }; + public: // New functions /** @@ -428,6 +440,9 @@ HBufC* iTextBuffer; + // The dialogs with different button. + TDialogInfoType iDialogType; + }; #endif // CPHSRVUSSDMANAGER_H diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneserver/rom/phoneserver_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneclientserver/phoneserver/rom/phoneserver_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 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: For packing phoneserver stub. +; +; Languages +&EN + +; Header +#{"PhoneServer"}, (0x10000850), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\PhoneServer.exe" +""-"z:\resource\PhoneServer.rsc" diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneserver/rom/phoneserver_stub.sis Binary file phoneclientserver/phoneserver/rom/phoneserver_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phoneclientserver/phoneserver/src/ussd/cphsrvussdmanager.cpp --- a/phoneclientserver/phoneserver/src/ussd/cphsrvussdmanager.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/phoneclientserver/phoneserver/src/ussd/cphsrvussdmanager.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -87,6 +87,11 @@ // The time out only for testing, from CPhSrvUssdReplyTimer.cpp const TUint KPhSrvUssdTimeout = 300000000; +//Refers to HbMessageBox::Yes +const TUint KHbMsgBoxBtnYes = 0x00002000; +//Refers to HbMessageBox::No +const TUint KHbMsgBoxBtnNo = 0x00010000; + // Use QT style localization _LIT(KUssdLocFilename, "ussd_"); _LIT(KCommonLocFilename, "common_"); @@ -390,7 +395,8 @@ iDeviceDialog( NULL ), iDCS ( KPhCltDcsUnknown ), iReturnResultPckg ( iReturnResult ), - iTextBuffer ( NULL ) + iTextBuffer ( NULL ), + iDialogType ( EInvalidType ) { CActiveScheduler::Add( this ); } @@ -878,6 +884,7 @@ CHbDeviceMessageBoxSymbian::ERejectButton, LoadDefaultString( KUssdExit ) ); _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.Exit" ); + iDialogType = EOnlyExit; } if ( iNotifyMessage || iMsgTypeReply ) @@ -913,6 +920,7 @@ iDeviceDialog->SetButton( CHbDeviceMessageBoxSymbian::EAcceptButton, EFalse ); _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.NoAnswer" ); + iDialogType = EOnlyExit; } // Show Reply key else @@ -922,7 +930,13 @@ iDeviceDialog->SetButtonTextL( CHbDeviceMessageBoxSymbian::EAcceptButton, LoadDefaultString( KUssdReply ) ); + iDeviceDialog->SetButton( + CHbDeviceMessageBoxSymbian::ERejectButton, ETrue ); + iDeviceDialog->SetButtonTextL( + CHbDeviceMessageBoxSymbian::ERejectButton, + LoadDefaultString( KUssdExit ) ); _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.WithAnswer" ); + iDialogType = EReplyExit; } @@ -1290,15 +1304,13 @@ { _DPRINT( 4, "PhSrv.MsgClose.Start" ); // ussd device dialog observer callback function - TPtrC leftBtn = aMessageBox->ButtonText( - CHbDeviceMessageBoxSymbian::EAcceptButton ); - TPtrC rightBtn = aMessageBox->ButtonText( - CHbDeviceMessageBoxSymbian::ERejectButton ); + _DDPRINT( 4, "PhSrv.MsgClose.iDialogType=", iDialogType ); + _DDPRINT( 4, "PhSrv.MsgClose.aBtn=", aButton ); + TInt err = KErrNone; // Click Yes on Confirmation note (Yes, No) - if ( !leftBtn.Compare( - LoadDefaultString( KUssdYes ) ) && + if ( EYesNo == iDialogType && ( CHbDeviceMessageBoxSymbian::EAcceptButton == aButton ) ) { _DPRINT( 4, "PhSrv.MsgClose.SK.Yes" ); @@ -1307,8 +1319,7 @@ TryCloseSession(); } // Click "No" on Confirmation note (Yes, No) - else if ( !rightBtn.Compare( - LoadDefaultString( KUssdNo ) ) && + else if ( EYesNo == iDialogType && ( CHbDeviceMessageBoxSymbian::ERejectButton == aButton ) ) { _DPRINT( 4, "PhSrv.MsgClose.SK.No" ); @@ -1318,8 +1329,7 @@ TryCloseSession(); } // Click "Next" on Notification note (Next, Exit) - else if ( !leftBtn.Compare( - LoadDefaultString( KUssdNext ) ) && + else if ( ENextExit == iDialogType && ( CHbDeviceMessageBoxSymbian::EAcceptButton == aButton ) ) { _DPRINT( 4, "PhSrv.MsgClose.SK.Next" ); @@ -1327,8 +1337,9 @@ TryCloseSession(); } // Click "Exit" on Notification note (Next, Exit or only Exit) - else if ( !rightBtn.Compare( - LoadDefaultString( KUssdExit ) ) && + else if ( (EOnlyExit == iDialogType + || ENextExit == iDialogType + || EReplyExit == iDialogType ) && ( CHbDeviceMessageBoxSymbian::ERejectButton == aButton ) ) { TRAP( err, ClearArrayL() ); @@ -1337,8 +1348,7 @@ _DPRINT( 4, "PhSrv.MsgClose.SK.Exit" ); } // Click "Reply" on Message note (Reply, Exit) - else if ( !leftBtn.Compare( - LoadDefaultString( KUssdReply ) ) && + else if ( EReplyExit == iDialogType && ( CHbDeviceMessageBoxSymbian::EAcceptButton == aButton ) ) { // Answer @@ -1410,6 +1420,7 @@ CHbDeviceMessageBoxSymbian::ERejectButton, LoadDefaultString( KUssdExit ) ); _DPRINT( 4, "PhSrv.LGMQ.Next&Exit" ); + iDialogType = ENextExit; } else { @@ -1422,25 +1433,25 @@ CHbDeviceMessageBoxSymbian::ERejectButton, LoadDefaultString( KUssdExit ) ); _DPRINT( 4, "PhSrv.LGMQ.onlyExit" ); + iDialogType = EOnlyExit; } if ( iClearArray ) { HbTextResolverSymbian::Init( KCommonLocFilename, KLocPath ); _DPRINT( 4, "PhSrv.LGMQ.use common loc file" ); // Yes, No - iDeviceDialog->SetButton( - CHbDeviceMessageBoxSymbian::EAcceptButton, ETrue ); + iDeviceDialog->SetStandardButtons(KHbMsgBoxBtnYes + |KHbMsgBoxBtnNo); iDeviceDialog->SetButtonTextL( CHbDeviceMessageBoxSymbian::EAcceptButton, LoadDefaultString( KUssdYes ) ); - iDeviceDialog->SetButton( - CHbDeviceMessageBoxSymbian::ERejectButton, ETrue ); iDeviceDialog->SetButtonTextL( CHbDeviceMessageBoxSymbian::ERejectButton, LoadDefaultString( KUssdNo ) ); _DPRINT( 4, "PhSrv.LGMQ.Yes&No" ); HbTextResolverSymbian::Init( KUssdLocFilename, KLocPath ); _DPRINT( 4, "PhSrv.LGMQ.back up to use ussd loc file" ); + iDialogType = EYesNo; } iReceivedMessage.Zero(); iReceivedMessage = (*iNotifyArray)[0]; @@ -1668,6 +1679,7 @@ iDeviceDialog->SetButtonTextL( CHbDeviceMessageBoxSymbian::EAcceptButton, LoadDefaultString( KUssdNext ) ); + iDialogType = ENextExit; } // Remove left softkey else diff -r 2fa1fa551b0b -r 78df25012fda phonecmdhandler/phonecmdhnlr/group/bld.inf --- a/phonecmdhandler/phonecmdhnlr/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/phonecmdhandler/phonecmdhnlr/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -24,6 +24,8 @@ PRJ_EXPORTS ../rom/phonecmdhandler.iby CORE_MW_LAYER_IBY_EXPORT_PATH(phonecmdhandler.iby) +../rom/phonecmdhandler_stub.sis\ + /epoc32/data/z/system/install/phonecmdhandler_stub.sis PRJ_MMPFILES phonecmdhandler.mmp diff -r 2fa1fa551b0b -r 78df25012fda phonecmdhandler/phonecmdhnlr/group/phonecmdhandler.mmp --- a/phonecmdhandler/phonecmdhnlr/group/phonecmdhandler.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/phonecmdhandler/phonecmdhnlr/group/phonecmdhandler.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -24,6 +24,7 @@ CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT +VERSION 10.0 SOURCEPATH ../src diff -r 2fa1fa551b0b -r 78df25012fda phonecmdhandler/phonecmdhnlr/rom/phonecmdhandler.iby --- a/phonecmdhandler/phonecmdhnlr/rom/phonecmdhandler.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/phonecmdhandler/phonecmdhnlr/rom/phonecmdhandler.iby Fri Sep 17 17:09:13 2010 +0300 @@ -19,10 +19,8 @@ #ifndef PHONECMDHANDLER_IBY #define PHONECMDHANDLER_IBY -file=ABI_DIR\BUILD_DIR\phonecmdhandler.dll SHARED_LIB_DIR\phonecmdhandler.dll +file=ABI_DIR\BUILD_DIR\phonecmdhandler.dll SHARED_LIB_DIR\phonecmdhandler.dll +data=ZSYSTEM\install\phonecmdhandler_stub.sis System\Install\phonecmdhandler_stub.sis #endif // PHONECMDHANDLER -// End of File - - diff -r 2fa1fa551b0b -r 78df25012fda phonecmdhandler/phonecmdhnlr/rom/phonecmdhandler_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonecmdhandler/phonecmdhnlr/rom/phonecmdhandler_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing aiwdialdata stub component. +; +; Languages +&EN + +; Header +#{"phonecmdhandler"}, (0x10205046), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\phonecmdhandler.dll" diff -r 2fa1fa551b0b -r 78df25012fda phonecmdhandler/phonecmdhnlr/rom/phonecmdhandler_stub.sis Binary file phonecmdhandler/phonecmdhnlr/rom/phonecmdhandler_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda phonesrv_plat/dialpad_api/inc/dialpadkeyhandler.h --- a/phonesrv_plat/dialpad_api/inc/dialpadkeyhandler.h Fri Sep 03 13:59:20 2010 +0300 +++ b/phonesrv_plat/dialpad_api/inc/dialpadkeyhandler.h Fri Sep 17 17:09:13 2010 +0300 @@ -27,6 +27,11 @@ class DialpadKeySequenceEventFilter; class DialpadEmergencyCallEventFilter; class DialpadHashEventFilter; +#ifdef _DEBUG + #ifdef __WINSCW__ + class DialpadInternalEventFilter; + #endif +#endif class HbMainWindow; #ifdef BUILD_DIALPADKEYHANDLER @@ -96,6 +101,11 @@ QScopedPointer mKeySequenceFilter; QScopedPointer mEmergencyCallFilter; QScopedPointer mHashFilter; +#ifdef _DEBUG + #ifdef __WINSCW__ + QScopedPointer mInternalFilter; + #endif +#endif }; #endif // DIALPADKEYHANDLER_H diff -r 2fa1fa551b0b -r 78df25012fda phonesrv_plat/phone_settings_api/inc/psetcallbarringwrapper.h --- a/phonesrv_plat/phone_settings_api/inc/psetcallbarringwrapper.h Fri Sep 03 13:59:20 2010 +0300 +++ b/phonesrv_plat/phone_settings_api/inc/psetcallbarringwrapper.h Fri Sep 17 17:09:13 2010 +0300 @@ -90,11 +90,13 @@ * Enables specified barring. Result is signaled with * enableBarringRequestCompleted. * + * @param basicServiceGroup Basic service group concerned. * @param serviceGroup Service group concerned. * @param barringType Barring type. * @param barringPassword Barring password. */ void enableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, BarringType barringType, QString barringPassword); @@ -103,11 +105,13 @@ * Disables specified barring. Result is signaled with * disableBarringRequestCompleted. * + * @param basicServiceGroup Basic service group concerned. * @param serviceGroup Service group concerned. * @param barringType Barring type. * @param barringPassword Barring password. */ void disableBarring( + int basicServiceGroup, PsServiceGroup serviceGroup, BarringType barringType, QString barringPassword); diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/Commands/CallControlCmd/src/CCallControlHandler.cpp --- a/satengine/satserver/Commands/CallControlCmd/src/CCallControlHandler.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/satengine/satserver/Commands/CallControlCmd/src/CCallControlHandler.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -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" @@ -30,6 +30,13 @@ // USSD DCS coding. const TUint8 KSatDcs7Bit( 0x40 ); + /** + * USSD messages coded as a packed string within 160 octets, as defined for a + * ussd-String within GSM 04.80 and GSM 03.38. if the Dcs is 7 bit, a ussd + * string can have 182 charactor + */ +const TInt KSatMaxUSSDString( 182 ); + // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -541,17 +548,22 @@ TInt err( KErrNone ); RSat::TUssdString ussdString; err = iCallControlData.GetSendUssdDetails ( ussdString ); + //If the Dcs or string length is not valid we should not send the ussd. + if( !err ) + { + if( !( iUtils->MultiModeApi().IsValidUssdDcs( ussdString.iDcs ) ) + || ( KSatMaxUSSDString < ussdString.iUssdString.Length() ) ) + { + err = KErrArgument; + } + } + if ( !err ) { LOG2( NORMAL, "CALLCONTROL: CCallControlHandler::SendUssd string %S", &ussdString.iUssdString ) - LOG2( NORMAL, "CALLCONTROL: CCallControlHandler::SendUssd schema %d", - ussdString.iDcs ) - RMobileUssdMessaging::TMobileUssdAttributesV1 ussdAttr; - - if ( KSatDcs7Bit == ussdString.iDcs ) { ussdAttr.iFormat= RMobileUssdMessaging::EFormatPackedString; @@ -583,13 +595,12 @@ err = KErrNoMemory; } } - + LOG2( NORMAL, "CALLCONTROL: CCallControlHandler::SendUssd exiting %d", err) return err; } - // ----------------------------------------------------------------------------- // CCallControlHandler::DispatchCcRequestComplete // (other items were commented in a header). diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/Commands/SendUSSDCmd/group/SendUssdCmd.mmp --- a/satengine/satserver/Commands/SendUSSDCmd/group/SendUssdCmd.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/satengine/satserver/Commands/SendUSSDCmd/group/SendUssdCmd.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -42,11 +42,14 @@ SYSTEMINCLUDE /epoc32/include/ecom SYSTEMINCLUDE ../../../../../inc // Domain telephony SYSTEMINCLUDE ../../../../inc // Subsystem satengine +SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets LIBRARY euser.lib LIBRARY etelsat.lib LIBRARY SatEngine.lib LIBRARY phoneclient.lib // Ussd sender +LIBRARY hbwidgets.lib +LIBRARY centralrepository.lib // CRepository #ifdef ENABLE_SAT_LOGGING LIBRARY flogger.lib diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/Commands/SendUSSDCmd/inc/CSendUssdHandler.h --- a/satengine/satserver/Commands/SendUSSDCmd/inc/CSendUssdHandler.h Fri Sep 03 13:59:20 2010 +0300 +++ b/satengine/satserver/Commands/SendUSSDCmd/inc/CSendUssdHandler.h Fri Sep 17 17:09:13 2010 +0300 @@ -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" @@ -140,6 +140,13 @@ TUint8& aReceivedDcs ); /** + * Show the ussd response note. + * + * @param aText The USSD response string to be shown. + */ + void ShowUssdResponseNoteL( const TDesC& aText ); + + /** * Handles the result of Ussd sending * * @param aError Result of Ussd sending @@ -161,18 +168,16 @@ void SendTerminalResponse(); /** - * Check validity of a given Data Coding Cheme (Dcs). - * - * @param aDcs Data Coding Cheme to be validated. - * @return TBool indicating Dcs validity. - */ - TBool DcsValid( const TUint8 aDcs ) const; - - /** * Checks is the command transparent or not * */ TBool TransparentUssdSending(); + + /** + * Check whether the ussd sending result is displayed + * @return 1 indicating the result is displayed + */ + TInt SatDisplayUssdResultL(); private: // data @@ -282,6 +287,10 @@ */ TBool iIconCommand; + /** + * Indicates whether the result of sending USSD is displayed + */ + TBool iIsSatDisplayUssdResult; }; #endif // CSENDUSSDHANDLER_H diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp --- a/satengine/satserver/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/satengine/satserver/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -17,12 +17,16 @@ #include -#include +#include #include +#include +#include +#include #include "MSatSystemState.h" #include "MSatApi.h" #include "MSatUtils.h" +#include "msatmultimodeapi.h" #include "MSatUiSession.h" #include "SatSOpcodes.h" #include "MSatSUiClientHandler.h" @@ -30,13 +34,11 @@ #include "TSatExtErrorUtils.h" #include "SatLog.h" -const TUint8 KQuarterShift( 2 ); -const TUint8 KHighNibbleShift( 4 ); -const TUint8 KDcsCharacterSet7Bit( 0x00 ); -const TUint8 KDcsCharacterSet8Bit( 0x01 ); -const TUint8 KDcsCharacterSet16Bit( 0x02 ); -const TUint8 KDcsCharacterSet7Bit2( 0x00 ); -const TUint8 KDcsCharacterSet16Bit2( 0x01 ); + /** + * USSD messages coded as a packed string within 160 octets, as defined for a + * ussd-String within GSM 04.80 and GSM 03.38. if the Dcs is 7 bit, a ussd + * string can have 182 charactor + */ const TInt KSatMaxUSSDString( 182 ); // USSD DCS coding. @@ -309,7 +311,8 @@ { LOG( SIMPLE, "SENDUSSD: dataValid true" ) // Validate Data Coding Scheme. - dataValid = DcsValid( iSendUssdData.iUssdString.iDcs ); + dataValid = iUtils->MultiModeApi().IsValidUssdDcs( + iSendUssdData.iUssdString.iDcs ); if ( !dataValid ) { LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::CommandAllowed Dcs \ @@ -564,10 +567,17 @@ iNotificationRsp(), iNotificationRspPckg( iNotificationRsp ), // To be removed when icons are allowed in this command - iIconCommand( EFalse ) + iIconCommand( EFalse ), + iIsSatDisplayUssdResult( EFalse ) { LOG( SIMPLE, - "SENDUSSD: CSendUssdHandler::CSendUssdHandler calling - exiting" ) + "SENDUSSD: CSendUssdHandler::CSendUssdHandler calling" ) + TRAPD( result, iIsSatDisplayUssdResult = SatDisplayUssdResultL(); ) + LOG2( NORMAL, "SENDUSSD: CSendUssdHandler::CSendUssdHandler \ + get CRepository key failed result: %d", result ) + + LOG( SIMPLE, + "SENDUSSD: CSendUssdHandler::CSendUssdHandler exiting" ) } @@ -595,6 +605,15 @@ iSendUssdRsp.iUssdString.iUssdString.Copy( receiveMessage ); + if ( ( RSat::EAlphaIdProvided != iSendUssdData.iAlphaId.iStatus ) + && iIsSatDisplayUssdResult ) + { + // if no Alpha ID provided, show the text note. + LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SendUssdString Show Note" ) + TRAP_IGNORE( + ShowUssdResponseNoteL( iSendUssdRsp.iUssdString.iUssdString ) ); + } + HandleSendUssdResult( error ); LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SendUssdString exiting" ) @@ -671,6 +690,23 @@ } // ----------------------------------------------------------------------------- +// Show the ussd response note. +// ----------------------------------------------------------------------------- +// +void CSendUssdHandler::ShowUssdResponseNoteL( const TDesC& aText ) + { + LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::ShowUssdResponseNoteL calling" ) + CHbDeviceMessageBoxSymbian::InformationL( aText ); + + CHbDeviceMessageBoxSymbian* messageNote = CHbDeviceMessageBoxSymbian::NewL(); + CleanupStack::PushL( messageNote ); + messageNote->SetButton( CHbDeviceMessageBoxSymbian::ERejectButton, EFalse ); + CleanupStack::PopAndDestroy(); // messageNote + + LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::ShowUssdResponseNoteL exiting" ) + } + +// ----------------------------------------------------------------------------- // Handles the result of Ussd sending. // ----------------------------------------------------------------------------- // @@ -902,71 +938,6 @@ LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SendTerminalResponse exiting" ) } -// ----------------------------------------------------------------------------- -// Check validity of a given Data Coding Cheme (Dcs). -// ----------------------------------------------------------------------------- -// -TBool CSendUssdHandler::DcsValid( const TUint8 aDcs ) const - { - LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::DcsValid calling" ) - - TBool isDcsValid( EFalse ); - // 76543210 - TUint8 codingGroup = ( aDcs & 0xF0 ) >> KHighNibbleShift; // bits XXXX____ - TUint8 characterSet = ( aDcs & 0x0C ) >> KQuarterShift; // bits ____XX__ - TUint8 lowQuartet = ( aDcs & 0x0F ); // bits ____XXXX - LOG2( SIMPLE, - "SENDUSSD: CSendUssdHandler::DcsValid codingGroup: %x", codingGroup) - switch ( codingGroup ) - { - case 0x00: - case 0x02: - case 0x03: - case 0x0F: - { - isDcsValid = ETrue; - break; - } - - case 0x01: - { - if ( ( KDcsCharacterSet7Bit2 == lowQuartet ) || - ( KDcsCharacterSet16Bit2 == lowQuartet ) ) - { - LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::DcsValid valid" ) - isDcsValid = ETrue; - } - break; - } - - case 0x04: - case 0x05: - case 0x06: - case 0x07: - case 0x09: - { - if ( ( KDcsCharacterSet7Bit == characterSet ) || - ( KDcsCharacterSet8Bit == characterSet ) || - ( KDcsCharacterSet16Bit == characterSet ) ) - { - LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::DcsValid isDcsValid" ) - isDcsValid = ETrue; - } - break; - } - - default: - { - LOG2( SIMPLE, "SENDUSSD: Reserved Dcs found: %x", aDcs ) - } - } - - LOG2( - SIMPLE, - "SENDUSSD: CSendUssdHandler::DcsValid exiting, valid = %d", - isDcsValid ) - return isDcsValid; - } // ----------------------------------------------------------------------------- // USSD sending should be transparent if alpha identifier is provided but it's @@ -1002,3 +973,32 @@ return result; } +// ----------------------------------------------------------------------------- +// Check whether the ussd sending result is displayed +// ----------------------------------------------------------------------------- +// +TInt CSendUssdHandler::SatDisplayUssdResultL() + { + LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SatDisplayUssdResultL calling" ) + TInt result( KErrNone ); + TInt ussdDisplayResult( KErrNone ); + + CRepository* repository = NULL; + repository = CRepository::NewL( KCRUidSatServer ); + + if ( repository ) + { + result = repository->Get( KSatDisplayUssdResult, ussdDisplayResult ); + LOG3( NORMAL, + "SENDUSSD: CSendUssdHandler::CSendUssdHandler \ + get CRepository key DisplayResult: %d, result: %d ", + ussdDisplayResult, result ) + } + + delete repository; + repository = NULL; + + LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SatDisplayUssdResultL exiting" ) + return ussdDisplayResult; + } + diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/Engine/inc/csatmultimodeapi.h --- a/satengine/satserver/Engine/inc/csatmultimodeapi.h Fri Sep 03 13:59:20 2010 +0300 +++ b/satengine/satserver/Engine/inc/csatmultimodeapi.h Fri Sep 17 17:09:13 2010 +0300 @@ -180,6 +180,14 @@ */ virtual void DialEmergencyCall(TRequestStatus& aReqStatus, const TDesC& aNumber); + + /** + * Check validity of a given Data Coding Cheme (Dcs). + * used by call control handler and send ussd handler + * @param aDcs Data Coding Cheme to be validated. + * @return TBool indicating Dcs validity. + */ + virtual TBool IsValidUssdDcs( const TUint8 aDcs ); private: diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/Engine/src/csatmultimodeapi.cpp --- a/satengine/satserver/Engine/src/csatmultimodeapi.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/satengine/satserver/Engine/src/csatmultimodeapi.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -29,6 +29,14 @@ const TInt KLoopMaxTryouts = 5; const TInt KLoopTimeout = 3000000; +const TUint8 KQuarterShift( 2 ); +const TUint8 KHighNibbleShift( 4 ); +const TUint8 KDcsCharacterSet7Bit( 0x00 ); +const TUint8 KDcsCharacterSet8Bit( 0x01 ); +const TUint8 KDcsCharacterSet16Bit( 0x02 ); +const TUint8 KDcsCharacterSet7Bit2( 0x00 ); +const TUint8 KDcsCharacterSet16Bit2( 0x01 ); + // ================= MEMBER FUNCTIONS ========================================== // ----------------------------------------------------------------------------- @@ -423,6 +431,79 @@ } // ----------------------------------------------------------------------------- +// Check validity of a given Data Coding Scheme (Dcs). +// For the details how the DCS is validated please check TS_123038 +// ----------------------------------------------------------------------------- +// +TBool CSatMultiModeApi::IsValidUssdDcs( const TUint8 aDcs ) + { + LOG2( SIMPLE, + "SATENGINE: CSatMultiModeApi::IsValidUssdDcs calling dcs = %x", aDcs) + + TBool isDcsValid( EFalse ); + // 76543210 + TUint8 codingGroup = ( aDcs & 0xF0 ) >> KHighNibbleShift; // bits XXXX____ + TUint8 characterSet = ( aDcs & 0x0C ) >> KQuarterShift; // bits ____XX__ + TUint8 lowQuartet = ( aDcs & 0x0F ); // bits ____XXXX + + LOG2( SIMPLE, + "SATENGINE: CSatMultiModeApi::IsValidUssdDcs codingGroup: %x", codingGroup) + LOG2( SIMPLE, + "SATENGINE: CSatMultiModeApi::IsValidUssdDcs charSet: %x", characterSet) + LOG2( SIMPLE, + "SATENGINE: CSatMultiModeApi::IsValidUssdDcs lowQuartet: %x", lowQuartet) + + switch ( codingGroup ) + { + case 0x00: + case 0x02: + case 0x03: + case 0x0F: + { + isDcsValid = ETrue; + break; + } + + case 0x01: + { + if ( ( KDcsCharacterSet7Bit2 == lowQuartet ) || + ( KDcsCharacterSet16Bit2 == lowQuartet ) ) + { + isDcsValid = ETrue; + } + break; + } + + case 0x04: + case 0x05: + case 0x06: + case 0x07: + case 0x09: + { + if ( ( KDcsCharacterSet7Bit == characterSet ) || + ( KDcsCharacterSet8Bit == characterSet ) || + ( KDcsCharacterSet16Bit == characterSet ) ) + { + isDcsValid = ETrue; + } + break; + } + + default: + { + LOG2( SIMPLE, "SATENGINE: CSatMultiModeApi::IsValidUssdDcs \ + Reserved Dcs found: %x", aDcs ) + } + } + + LOG2( + SIMPLE, + "SATENGINE: CSatMultiModeApi::IsValidUssdDcs exiting, valid = %d", + isDcsValid ) + return isDcsValid; + } + +// ----------------------------------------------------------------------------- // CSatMultiModeApi::ConstructL // ----------------------------------------------------------------------------- // diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/conf/sat.confml Binary file satengine/satserver/conf/sat.confml has changed diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/conf/sat_102078E1.crml Binary file satengine/satserver/conf/sat_102078E1.crml has changed diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/inc/SATPrivateCRKeys.h --- a/satengine/satserver/inc/SATPrivateCRKeys.h Fri Sep 03 13:59:20 2010 +0300 +++ b/satengine/satserver/inc/SATPrivateCRKeys.h Fri Sep 17 17:09:13 2010 +0300 @@ -60,6 +60,15 @@ * Default value: N/A */ const TUint32 KSatHomeZoneIconVisible( 0x00000032 ); + +// Defines whether USSD sending result is shown if no alpha id +/** +* Support is disabled if value is 0 +* +* Default value: N/A +*/ +const TUint32 KSatDisplayUssdResult( 0x00000064 ); + #endif // SATPRIVATECRKEYS_H // End of File diff -r 2fa1fa551b0b -r 78df25012fda satengine/satserver/inc/msatmultimodeapi.h --- a/satengine/satserver/inc/msatmultimodeapi.h Fri Sep 03 13:59:20 2010 +0300 +++ b/satengine/satserver/inc/msatmultimodeapi.h Fri Sep 17 17:09:13 2010 +0300 @@ -166,6 +166,15 @@ virtual void DialEmergencyCall(TRequestStatus& aReqStatus, const TDesC& aNumber) = 0; + + /** + * Check validity of a given Data Coding Cheme (Dcs). + * used by call control handler and send ussd handler + * @param aDcs Data Coding Cheme to be validated. + * @return TBool indicating Dcs validity. + */ + virtual TBool IsValidUssdDcs( const TUint8 aDcs ) = 0; + }; #endif // MSATMULTIMODEAPI_H diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/dialpad.pro --- a/telutils/dialpad/dialpad.pro Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/dialpad.pro Fri Sep 17 17:09:13 2010 +0300 @@ -66,6 +66,7 @@ TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = ALL -TCB TARGET.UID3 = 0x102078ED + VERSION = 10.0 defFiles = \ "$${LITERAL_HASH}ifdef WINS" \ @@ -89,7 +90,18 @@ -lfeatmgr \ -lphoneclient \ -lcentralrepository \ - -lxqsettingsmanager + -lxqsettingsmanager + + contains(SYMBIAN_PLATFORMS, "WINSCW") { + HEADERS += inc/dialpadinternaleventfilter.h + SOURCES += src/dialpadinternaleventfilter.cpp + LIBS += -lcone \ + -lapgrfx \ + -lapparc + + BLD_INF_RULES.prj_exports += \ + "./rom/dialpad_stub.sis /epoc32/data/z/system/install/dialpad_stub.sis" + } } else:win32 { HEADERS += inc/dialpadsymbianwrapper_p_stub.h diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/inc/dialpadinternaleventfilter.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/inc/dialpadinternaleventfilter.h Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,49 @@ +/*! +* Copyright (c) 2009 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: Dialpad keypad +* +*/ + +#ifndef DIALPADINTERNALEVENTFILTER_H +#define DIALPADINTERNALEVENTFILTER_H + +#include +#include + +/** +* Event filter for internal development purposes. +* PhoneUi.exe can be shut down with long press 9 and +* restarted with long press 8 in Dialpad +*/ +class DialpadInternalEventFilter : public QObject +{ + Q_OBJECT + +public: + DialpadInternalEventFilter(); + ~DialpadInternalEventFilter(); +protected: + bool eventFilter(QObject *watched, QEvent *event); +private slots: + void togglePhoneUi(); +private: + void shutdown(); + void start(); + +private: + QTimer *mLongPressTimer; + int mKey; +}; + +#endif // DIALPADINTERNALEVENTFILTER_H diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/inc/dialpadnumericbutton.h --- a/telutils/dialpad/inc/dialpadnumericbutton.h Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/inc/dialpadnumericbutton.h Fri Sep 17 17:09:13 2010 +0300 @@ -25,27 +25,34 @@ { Q_OBJECT + // use label instead of text to override input button properties + Q_PROPERTY(QString iconName READ iconName) + Q_PROPERTY(QString primaryLabel READ primaryLabel WRITE setPrimaryLabel) + Q_PROPERTY(QString secondaryLabel READ secondaryLabel WRITE setSecondaryLabel) + Q_PROPERTY(QString secondaryLabelRow2 READ secondaryLabelRow2 WRITE setSecondaryLabelRow2) + public: explicit DialpadNumericButton(int keyCode, const QPoint &position, const QSize &size = QSize(1, 1)); virtual ~DialpadNumericButton(); void setIcon(const HbIcon& icon); HbIcon& icon(); + QString iconName() const; - void setText(const QString& text); - QString text() const; + void setPrimaryLabel(const QString& value); + QString primaryLabel() const; - void setSecondaryText(const QString& text); - QString secondaryText() const; + void setSecondaryLabel(const QString& value); + QString secondaryLabel() const; - void setSecondary2ndRowText(const QString& text); - QString secondary2ndRowText() const; + void setSecondaryLabelRow2(const QString& value); + QString secondaryLabelRow2() const; private: HbIcon mIcon; - QString mText; - QString mSecondaryText; - QString mSecondaryTextRow2; + QString mPrimaryLabel; + QString mSecondaryLabel; + QString mSecondaryLabelRow2; }; #endif // DIALPADNUMERICBUTTON_H diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/rom/dialpad.iby --- a/telutils/dialpad/rom/dialpad.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/rom/dialpad.iby Fri Sep 17 17:09:13 2010 +0300 @@ -21,6 +21,7 @@ #include -file=ABI_DIR\BUILD_DIR\dialpad.dll SHARED_LIB_DIR\dialpad.dll +file=ABI_DIR\BUILD_DIR\dialpad.dll SHARED_LIB_DIR\dialpad.dll +data=ZSYSTEM\install\dialpad_stub.sis System\Install\dialpad_stub.sis #endif // __DIALPAD_IBY__ diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/rom/dialpad_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/rom/dialpad_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 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: For packing phone contact finder stub. +; +; Languages +&EN + + +; SIS header: name, uid, version +#{"dialpad"},(0x102078ED),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +"" - "z:\sys\bin\dialpad.dll" + diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/rom/dialpad_stub.sis Binary file telutils/dialpad/rom/dialpad_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/src/dialpadinternaleventfilter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/src/dialpadinternaleventfilter.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,112 @@ +/*! +* Copyright (c) 2009 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: Dialpad keypad +* +*/ +#include "dialpadinternaleventfilter.h" +#include "qtphonesrvlog.h" + +#include +#include +#include + +#include +#include +#include +#include +#include + +const int DialpadLongKeyPressTimeOut(1000); + +DialpadInternalEventFilter::DialpadInternalEventFilter() : + QObject(), + mKey(0) +{ + PHONE_TRACE; + mLongPressTimer = new QTimer(this); + mLongPressTimer->setSingleShot(true); + connect(mLongPressTimer,SIGNAL(timeout()), this, SLOT(togglePhoneUi())); +} + +DialpadInternalEventFilter::~DialpadInternalEventFilter() +{ +} + +bool DialpadInternalEventFilter::eventFilter(QObject *watched, QEvent *event) +{ + Q_UNUSED(watched) + + if (event->type() == QEvent::KeyPress) { + QKeyEvent *keyEvent = static_cast(event); + if (keyEvent->key() == Qt::Key_8 || keyEvent->key() == Qt::Key_9) { + mKey = keyEvent->key(); + mLongPressTimer->stop(); + mLongPressTimer->start(DialpadLongKeyPressTimeOut); + } + } else if (event->type() == QEvent::KeyRelease) { + mLongPressTimer->stop(); + } + + // Don't consume the key + return false; +} + +void DialpadInternalEventFilter::togglePhoneUi() +{ + if(mKey == Qt::Key_8) { + start(); + } + if(mKey == Qt::Key_9) { + shutdown(); + } +} + +void DialpadInternalEventFilter::shutdown() +{ + HbDeviceNotificationDialog notificationDialog; + QString text = "Shutting down phoneui.exe"; + notificationDialog.setText(text); + notificationDialog.show(); + + + qDebug() << "Shutting down phoneui.exe"; + + const TUid KPhoneAppUid = {0x100058B3}; + TApaTaskList taskList(CCoeEnv::Static()->WsSession()); + TApaTask task = taskList.FindApp(KPhoneAppUid); + + if (task.Exists()){ + task.EndTask(); // Ends the task + } +} + +void DialpadInternalEventFilter::start() +{ + + HbDeviceNotificationDialog notificationDialog; + QString text = "Starting phoneui.exe"; + notificationDialog.setText(text); + notificationDialog.show(); + + TThreadId app_threadid; + CApaCommandLine* cmdLine; + cmdLine=CApaCommandLine::NewLC(); + cmdLine->SetExecutableNameL(_L("phoneui.exe")); + cmdLine->SetCommandL( EApaCommandRun ); + RApaLsSession ls; + User::LeaveIfError(ls.Connect()); + TInt err=ls.StartApp(*cmdLine,app_threadid); + ls.Close(); + CleanupStack::PopAndDestroy(); // cmdLine +} diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/src/dialpadkeyhandler.cpp --- a/telutils/dialpad/src/dialpadkeyhandler.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/src/dialpadkeyhandler.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -27,6 +27,11 @@ #include "dialpadkeysequenceeventfilter.h" #include "dialpademergencycalleventfilter.h" #include "dialpadhasheventfilter.h" +#ifdef _DEBUG + #ifdef __WINSCW__ + #include "dialpadinternaleventfilter.h" + #endif +#endif #include "qtphonesrvlog.h" DialpadKeyHandler::DialpadKeyHandler( @@ -56,6 +61,13 @@ mBtFilter.reset(new DialpadBluetoothEventFilter(dialPad)); mKeySequenceFilter.reset(new DialpadKeySequenceEventFilter(dialPad)); mHashFilter.reset(new DialpadHashEventFilter(dialPad)); + +#ifdef _DEBUG + #ifdef __WINSCW__ + mInternalFilter.reset(new DialpadInternalEventFilter); + mMainWindow.installEventFilter(mInternalFilter.data()); + #endif +#endif // Stack different event filters mMainWindow.installEventFilter(mVmbxFilter.data()); @@ -127,4 +139,9 @@ mMainWindow.removeEventFilter(mKeySequenceFilter.data()); mMainWindow.removeEventFilter(mEmergencyCallFilter.data()); mMainWindow.removeEventFilter(mHashFilter.data()); +#ifdef _DEBUG + #ifdef __WINSCW__ + mMainWindow.removeEventFilter(mInternalFilter.data()); + #endif +#endif } diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/src/dialpadnumericbutton.cpp --- a/telutils/dialpad/src/dialpadnumericbutton.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/src/dialpadnumericbutton.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -38,32 +38,37 @@ return mIcon; } -void DialpadNumericButton::setText(const QString& text) +QString DialpadNumericButton::iconName() const { - mText = text; + return mIcon.iconName(); } -QString DialpadNumericButton::text() const +void DialpadNumericButton::setPrimaryLabel(const QString& value) { - return mText; + mPrimaryLabel = value; } -void DialpadNumericButton::setSecondaryText(const QString& text) +QString DialpadNumericButton::primaryLabel() const { - mSecondaryText = text; + return mPrimaryLabel; } -QString DialpadNumericButton::secondaryText() const +void DialpadNumericButton::setSecondaryLabel(const QString& value) { - return mSecondaryText; + mSecondaryLabel = value; +} + +QString DialpadNumericButton::secondaryLabel() const +{ + return mSecondaryLabel; } -void DialpadNumericButton::setSecondary2ndRowText(const QString& text) +void DialpadNumericButton::setSecondaryLabelRow2(const QString& value) { - mSecondaryTextRow2 = text; + mSecondaryLabelRow2 = value; } -QString DialpadNumericButton::secondary2ndRowText() const +QString DialpadNumericButton::secondaryLabelRow2() const { - return mSecondaryTextRow2; + return mSecondaryLabelRow2; } diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/src/dialpadnumericbuttongrid.cpp --- a/telutils/dialpad/src/dialpadnumericbuttongrid.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/src/dialpadnumericbuttongrid.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -135,8 +135,8 @@ if (keyCode == Qt::Key_Asterisk) { // asterisk is not localized QChar asterisk('*'); - button(i)->setText(asterisk); - button(i)->setSecondaryText(QLatin1String("+")); + button(i)->setPrimaryLabel(asterisk); + button(i)->setSecondaryLabel(QLatin1String("+")); mGeneratedChar.insert(Qt::Key_Asterisk, asterisk); continue; } @@ -144,7 +144,7 @@ if (keyCode == Qt::Key_NumberSign) { // number sign is not localized QChar numberSign('#'); - button(i)->setText(numberSign); + button(i)->setPrimaryLabel(numberSign); mGeneratedChar.insert(Qt::Key_NumberSign, numberSign); continue; } @@ -172,18 +172,18 @@ numberChar = QChar(keyCode); } - button(i)->setText(numberChar); + button(i)->setPrimaryLabel(numberChar); mGeneratedChar.insert(keyCode,numberChar); // // set alphabets // if (keyLabels && keyLabels->chars.count()>=2) { - button(i)->setSecondaryText(keyLabels->chars.at(1)); + button(i)->setSecondaryLabel(keyLabels->chars.at(1)); if (keyLabels->chars.count()>=4) { - button(i)->setSecondary2ndRowText(keyLabels->chars.at(3)); + button(i)->setSecondaryLabelRow2(keyLabels->chars.at(3)); } else { - button(i)->setSecondary2ndRowText(QString()); + button(i)->setSecondaryLabelRow2(QString()); } } } @@ -360,31 +360,31 @@ for (int i = 0; i < (DialpadRowCount*DialpadColumnCount); i++) { DialpadNumericButton *item = button(i); if (item->state()==HbInputButton::ButtonStatePressed) { - if (item->text().length()) { - pressedState.append(item->text()); + if (item->primaryLabel().length()) { + pressedState.append(item->primaryLabel()); pressedState.append(QChar(QChar::LineSeparator)); } - if (item->secondaryText().length()) { - pressedStateSecondary.append(item->secondaryText()); + if (item->secondaryLabel().length()) { + pressedStateSecondary.append(item->secondaryLabel()); pressedStateSecondary.append(QChar(QChar::LineSeparator)); - if (item->secondary2ndRowText().length()) { - pressedStateSecondary.append(item->secondary2ndRowText()); + if (item->secondaryLabelRow2().length()) { + pressedStateSecondary.append(item->secondaryLabelRow2()); pressedStateSecondary.append(QChar(QChar::LineSeparator)); useTwoRows = true; } } } else { // ButtonStateNormal - if (item->text().length()) { - normalState.append(item->text()); + if (item->primaryLabel().length()) { + normalState.append(item->primaryLabel()); normalState.append(QChar(QChar::LineSeparator)); } - if (item->secondaryText().length()) { - normalStateSecondary.append(item->secondaryText()); + if (item->secondaryLabel().length()) { + normalStateSecondary.append(item->secondaryLabel()); normalStateSecondary.append(QChar(QChar::LineSeparator)); - if (item->secondary2ndRowText().length()) { - normalStateSecondary.append(item->secondary2ndRowText()); + if (item->secondaryLabelRow2().length()) { + normalStateSecondary.append(item->secondaryLabelRow2()); normalStateSecondary.append(QChar(QChar::LineSeparator)); useTwoRows = true; } @@ -476,8 +476,8 @@ for (int j = 0; j < (DialpadRowCount*DialpadColumnCount); j++) { DialpadNumericButton *item = button(j); - if ((type==PrimaryText && item->text().isNull()) || - (type==SecondaryText && item->secondaryText().isNull())) { + if ((type==PrimaryText && item->primaryLabel().isNull()) || + (type==SecondaryText && item->secondaryLabel().isNull())) { continue; // no text for this button -> next button } @@ -495,7 +495,7 @@ cellHeight,textHeight); // store line width, for drawing secondary text - qreal lineWidth = fontMetrics.width(item->text()); + qreal lineWidth = fontMetrics.width(item->primaryLabel()); if (mMaxPrimaryLineWidth == 0 && (j>0 && j<10) && lineWidth > maxLineWidth) { maxLineWidth = lineWidth; @@ -518,7 +518,7 @@ qreal textHeight) const { QTextLine line = layout.createLine(); - line.setNumColumns(button.text().length()); + line.setNumColumns(button.primaryLabel().length()); qreal textPositionX = (button.position().x() * cellWidth) + (DialpadPrimaryTextLeftMargin * mUnit) + buttonBorderSize(); @@ -543,7 +543,7 @@ QTextLine line = layout.createLine(); if (useTwoRows) { - line.setNumColumns(button.secondaryText().length()); + line.setNumColumns(button.secondaryLabel().length()); textPositionX = (button.position().x() * cellWidth) + (DialpadPrimaryTextLeftMargin * mUnit) + @@ -551,13 +551,13 @@ (DialpadPrimarySecondaryMargin * mUnit) + buttonBorderSize(); - if (button.secondary2ndRowText().length()) { + if (button.secondaryLabelRow2().length()) { textPositionY = (button.position().y() + (0.5 * button.size().height())) * cellHeight; QTextLine line2 = layout.createLine(); - line2.setNumColumns(button.secondary2ndRowText().length()); + line2.setNumColumns(button.secondaryLabelRow2().length()); line2.setPosition(QPointF(textPositionX,textPositionY-textHeight)); } else { textPositionY = (button.position().y() + @@ -565,7 +565,7 @@ cellHeight - (0.5 * textHeight); } } else { - line.setNumColumns(button.secondaryText().length()); + line.setNumColumns(button.secondaryLabel().length()); textPositionX = (button.position().x() * cellWidth) + (DialpadPrimaryTextLeftMargin * mUnit) + mMaxPrimaryLineWidth + diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/tsrc/dialpadtest/dialpadtestview.cpp --- a/telutils/dialpad/tsrc/dialpadtest/dialpadtestview.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/tsrc/dialpadtest/dialpadtestview.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -16,6 +16,15 @@ */ #include + +//#define DIALPAD_ENABLE_TESTABILITY +#ifdef DIALPAD_ENABLE_TESTABILITY + #include + #include + #include + #include "testabilityinterface.h" +#endif + #include #include #include @@ -83,6 +92,9 @@ DialpadTestView::~DialpadTestView() { delete mDialpad; +#ifdef DIALPAD_ENABLE_TESTABILITY + delete mTestabilityInterface; +#endif } void DialpadTestView::openDialpad() @@ -255,3 +267,34 @@ } } +void DialpadTestView::loadTestabilityPlugin() +{ +#ifdef DIALPAD_ENABLE_TESTABILITY + QString testabilityPlugin = "testability/testability"; + QString testabilityPluginPostfix = ".dll"; + + testabilityPlugin = QLibraryInfo::location(QLibraryInfo::PluginsPath) + + QObject::tr("/") + testabilityPlugin + + testabilityPluginPostfix; + + QPluginLoader loader(testabilityPlugin.toLatin1().data()); + + QObject *plugin = loader.instance(); + if (plugin) { + qDebug("Testability plugin loaded successfully!"); + mTestabilityInterface = qobject_cast(plugin); + + if (mTestabilityInterface) { + qDebug("Testability interface obtained!"); + mTestabilityInterface->Initialize(); + } else { + qDebug("Failed to get testability interface!"); + } + } else { + qDebug("Testability plugin %s load failed with error:%s", + testabilityPlugin.toLatin1().data(), + loader.errorString().toLatin1().data()); + } +#endif +} + diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/tsrc/dialpadtest/dialpadtestview.h --- a/telutils/dialpad/tsrc/dialpadtest/dialpadtestview.h Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/tsrc/dialpadtest/dialpadtestview.h Fri Sep 17 17:09:13 2010 +0300 @@ -25,6 +25,10 @@ class Dialpad; class DialpadKeyHandler; +QT_BEGIN_NAMESPACE +class TestabilityInterface; +QT_END_NAMESPACE + class DialpadTestView : public HbView { Q_OBJECT @@ -41,6 +45,7 @@ void createListWidget(); void setDialpadPosition(); void handleDial(); + void loadTestabilityPlugin(); private slots: void openDialpad(); @@ -63,6 +68,8 @@ bool mTapOutsideDismiss; bool mArabicMode; bool mArabicDigit; + + TestabilityInterface* mTestabilityInterface; }; #endif // DIALPADTESTVIEW_H diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/tsrc/dialpadtest/tdriver/tc_dialpad.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/dialpad/tsrc/dialpadtest/tdriver/tc_dialpad.rb Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,105 @@ +############################################################################ +## +## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. +## +## This file is part of Dialpad. Reference TDriver test script. +## +## +############################################################################ + +require 'matti' +require 'orbitbehaviours.rb' +include MattiVerify + +require 'test/unit' + +class TC_Dialpad < Test::Unit::TestCase + + # setup and teardown methods are always executed before each and after each test case method + def setup + # get the calculator app running + @sut = MATTI.sut(:Id => "sut_qt") + @dtest = @sut.run(:name => "dialpadtest") + + end + + def teardown + @dtest.close + end + + def test_dialpad + + # tap toolbar to open dialpad + @dtest.HbToolBar().tap + verify( 5, "Dialpad should be open" ) { @dtest.Dialpad(:objectName => 'dialpad', + :visible => 'true')} + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '0,0', + :primaryLabel => '1', + :iconName => 'qtg_mono_voice_mailbox') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '1,0', + :primaryLabel => '2', + :secondaryLabel => 'abc') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '2,0', + :primaryLabel => '3', + :secondaryLabel => 'def') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '0,1', + :primaryLabel => '4', + :secondaryLabel => 'ghi') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '1,1', + :primaryLabel => '5', + :secondaryLabel => 'jkl') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '2,1', + :primaryLabel => '6', + :secondaryLabel => 'mno') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '0,2', + :primaryLabel => '7', + :secondaryLabel => 'pqrs') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '1,2', + :primaryLabel => '8', + :secondaryLabel => 'tuv') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '2,2', + :primaryLabel => '9', + :secondaryLabel => 'wxyz') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '0,3', + :primaryLabel => '*', + :secondaryLabel => '+') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '1,3', + :primaryLabel => '0', + :secondaryLabel => '') } + + verify { @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '2,3', + :primaryLabel => '#', + :secondaryLabel => '') } + + verify { @dtest.DialpadButton( :objectName => 'backspaceButton', :iconName => 'qtg_mono_backspace2' ) } + + verify { @dtest.DialpadButton( :objectName => 'callButton', :iconName => 'qtg_mono_call' ) } + + # enter 159 + @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '0,0').tap + @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '1,1').tap + @dtest.DialpadNumericButtonGrid.DialpadNumericButton(:position => '2,2').tap + + verify( 5, "Editor text should be 159" ) { @dtest.HbLineEdit(:objectName => 'numberEdit', :text => "159")} + + @dtest.DialpadButton({:objectName => 'backspaceButton'}).tap + verify( 5, "Editor text should be 15" ) { @dtest.HbLineEdit(:objectName => "numberEdit", :text => "15")} + + @dtest.Dialpad(:objectName => 'dialpad').flick(:Down) + verify_not( 5, "Dialpad should be closed" ) { @dtest.Dialpad(:objectName => 'dialpad')} + + end + +end diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/tsrc/unit/ut_dialpadkeyhandler/ut_dialpadkeyhandler.pro --- a/telutils/dialpad/tsrc/unit/ut_dialpadkeyhandler/ut_dialpadkeyhandler.pro Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadkeyhandler/ut_dialpadkeyhandler.pro Fri Sep 17 17:09:13 2010 +0300 @@ -50,6 +50,7 @@ ../../../inc/dialpadvideomailboxeventfilter.h \ ../../../inc/dialpadvoicemailboxeventfilter.h \ ../../../inc/dialpadhasheventfilter.h \ + ../../../inc/dialpadinternaleventfilter.h \ #/epoc32/include/mw/xqservicerequest.h \ /epoc32/include/mw/xqappmgr.h \ /epoc32/include/mw/xqaiwrequest.h \ @@ -63,6 +64,7 @@ ../shared/mock_dialpadvideomailboxeventfilter.cpp \ ../shared/mock_dialpadvoicemailboxeventfilter.cpp \ ../shared/mock_dialpadhasheventfilter.cpp \ + ../../../src/dialpadinternaleventfilter.cpp \ ../shared/mock_featmgr.cpp \ ../shared/mock_xqappmgr.cpp \ ../shared/mock_xqaiwrequest.cpp \ @@ -70,4 +72,5 @@ ../shared/mock_hbmainwindow.cpp \ ../shared/mock_xqrequestinfo.cpp -LIBS += -lmocklib -lsymbianmock -lxqservice -lxqserviceutil +LIBS += -lmocklib -lsymbianmock -lxqservice -lxqserviceutil -lcone -lapgrfx -lapparc + diff -r 2fa1fa551b0b -r 78df25012fda telutils/dialpad/tsrc/unit/ut_dialpadnumericbutton/ut_dialpadnumericbutton.cpp --- a/telutils/dialpad/tsrc/unit/ut_dialpadnumericbutton/ut_dialpadnumericbutton.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/dialpad/tsrc/unit/ut_dialpadnumericbutton/ut_dialpadnumericbutton.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -31,9 +31,9 @@ void initTestCase(); void cleanupTestCase(); - void testSetText(); - void testSetSecondaryText(); - void testSetSecondary2ndRowText(); + void testSetPrimaryLabel(); + void testSetSecondaryLabel(); + void testSetSecondaryLableRow2(); void testSetIcon(); private: @@ -50,20 +50,28 @@ delete mButton; } -void ut_DialpadNumericButton::testSetText() +void ut_DialpadNumericButton::testSetPrimaryLabel() { - QVERIFY(mButton->text().isNull()); - mButton->setText(QLatin1String("Primary text")); - QVERIFY(mButton->text() == QLatin1String("Primary text")); + QVERIFY(mButton->primaryLabel().isNull()); + mButton->setPrimaryLabel(QLatin1String("Primary text")); + QVERIFY(mButton->primaryLabel() == QLatin1String("Primary text")); } -void ut_DialpadNumericButton::testSetSecondaryText() +void ut_DialpadNumericButton::testSetSecondaryLabel() { - QVERIFY(mButton->secondaryText().isNull()); - mButton->setSecondaryText(QLatin1String("Secondary text")); - QVERIFY(mButton->secondaryText() == QLatin1String("Secondary text")); + QVERIFY(mButton->secondaryLabel().isNull()); + mButton->setSecondaryLabel(QLatin1String("Secondary text")); + QVERIFY(mButton->secondaryLabel() == QLatin1String("Secondary text")); } +void ut_DialpadNumericButton::testSetSecondaryLableRow2() +{ + QVERIFY(mButton->secondaryLabelRow2().isNull()); + mButton->setSecondaryLabelRow2(QLatin1String("Secondary 2nd row text")); + QVERIFY(mButton->secondaryLabelRow2() == QLatin1String("Secondary 2nd row text")); +} + + void ut_DialpadNumericButton::testSetIcon() { HbIcon icon(QLatin1String("dummy.svg")); @@ -75,12 +83,5 @@ QVERIFY(mButton->icon().color() == Qt::white); } -void ut_DialpadNumericButton::testSetSecondary2ndRowText() -{ - QVERIFY(mButton->secondary2ndRowText().isNull()); - mButton->setSecondary2ndRowText(QLatin1String("Secondary 2nd row text")); - QVERIFY(mButton->secondary2ndRowText() == QLatin1String("Secondary 2nd row text")); -} - DIALPAD_TEST_MAIN(ut_DialpadNumericButton) #include "ut_dialpadnumericbutton.moc" diff -r 2fa1fa551b0b -r 78df25012fda telutils/keysequencerecognitionservice/keysequencerecognitionservice.pro --- a/telutils/keysequencerecognitionservice/keysequencerecognitionservice.pro Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/keysequencerecognitionservice/keysequencerecognitionservice.pro Fri Sep 17 17:09:13 2010 +0300 @@ -26,6 +26,7 @@ TARGET.VID = VID_DEFAULT TARGET.CAPABILITY = CAP_APPLICATION TARGET.EPOCALLOWDLLDATA = 1 + VERSION = 10.0 INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE INCLUDEPATH += ../../inc @@ -51,4 +52,7 @@ -letel -letelmm -lcustomapi \ -lcentralrepository -lQtSystemInfo -lsecui \ -ltstaskmonitorclient + BLD_INF_RULES.prj_exports += \ + "./rom/keysequencerecognitionservice_stub.sis /epoc32/data/z/system/install/keysequencerecognitionservice_stub.sis" + } diff -r 2fa1fa551b0b -r 78df25012fda telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice.iby --- a/telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice.iby Fri Sep 17 17:09:13 2010 +0300 @@ -22,8 +22,10 @@ #include file = ABI_DIR/BUILD_DIR/keysequencerecognitionservice.exe \ - PROGRAMS_DIR/keysequencerecognitionservice.exe + PROGRAMS_DIR/keysequencerecognitionservice.exe data = DATAZ_/private/10003a3f/import/apps/keysequencerecognitionservice_reg.rsc \ - private/10003a3f/import/apps/keysequencerecognitionservice_reg.rsc + private/10003a3f/import/apps/keysequencerecognitionservice_reg.rsc +data=ZSYSTEM\install\keysequencerecognitionservice_stub.sis \ + System\Install\keysequencerecognitionservice_stub.sis #endif // __KEYSEQUENCERECOGNITIONSERVICE_IBY__ diff -r 2fa1fa551b0b -r 78df25012fda telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,32 @@ +; +; Copyright (c) 2009 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: For packing phone contact finder stub. +; +; Languages +&EN + + +; SIS header: name, uid, version +#{"keysequencerecognitionservice"},(0x2002FF8A),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +"" - "z:\sys\bin\keysequencerecognitionservice.exe" +"" - "z:\resource\apps\keysequencerecognitionservice.rsc" +"" - "z:\private\10003a3f\import\apps\keysequencerecognitionservice_reg.rsc" + diff -r 2fa1fa551b0b -r 78df25012fda telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice_stub.sis Binary file telutils/keysequencerecognitionservice/rom/keysequencerecognitionservice_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda telutils/phoneparser/group/bld.inf --- a/telutils/phoneparser/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/phoneparser/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -21,13 +21,10 @@ DEFAULT PRJ_EXPORTS - - -../group/phoneparser_stub.sis\ - /epoc32/data/z/system/install/phoneparser_stub.sis +../rom/phoneparser_stub.sis /epoc32/data/z/system/install/phoneparser_stub.sis // IBY file exports -../rom/phoneparser.iby CORE_MW_LAYER_IBY_EXPORT_PATH(phoneparser.iby) +../rom/phoneparser.iby CORE_MW_LAYER_IBY_EXPORT_PATH(phoneparser.iby) PRJ_MMPFILES ../group/phoneparser.mmp diff -r 2fa1fa551b0b -r 78df25012fda telutils/phoneparser/group/phoneparser.mmp --- a/telutils/phoneparser/group/phoneparser.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/phoneparser/group/phoneparser.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -21,6 +21,7 @@ TARGET phoneparser.dll TARGETTYPE dll UID 0x1000008d 0x100058E4 +VERSION 10.0 CAPABILITY CAP_GENERAL_DLL diff -r 2fa1fa551b0b -r 78df25012fda telutils/phoneparser/group/phoneparser.pkg --- a/telutils/phoneparser/group/phoneparser.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing phoneparser. -; -; Languages -&EN - -; Header -#{"PhoneParser"}, (0x100058E4), 10, 1, 0, TYPE=PU - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -"\epoc32\RELEASE\armv5\UREL\PhoneParser.dll"-"z:\sys\bin\PhoneParser.dll" diff -r 2fa1fa551b0b -r 78df25012fda telutils/phoneparser/group/phoneparser_stub.pkg --- a/telutils/phoneparser/group/phoneparser_stub.pkg Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -; -; Copyright (c) 2009 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: For packing phoneparser stub. -; -; Languages -&EN - -; Header -#{"PhoneParser"}, (0x100058E4), 1, 0, 0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -;Files -""-"z:\sys\bin\PhoneParser.dll" diff -r 2fa1fa551b0b -r 78df25012fda telutils/phoneparser/group/phoneparser_stub.sis Binary file telutils/phoneparser/group/phoneparser_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda telutils/phoneparser/rom/phoneparser.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/phoneparser/rom/phoneparser.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing phoneparser. +; +; Languages +&EN + +; Header +#{"PhoneParser"}, (0x100058E4), 10, 1, 0, TYPE=PU + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +"\epoc32\RELEASE\armv5\UREL\PhoneParser.dll"-"z:\sys\bin\PhoneParser.dll" diff -r 2fa1fa551b0b -r 78df25012fda telutils/phoneparser/rom/phoneparser_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/phoneparser/rom/phoneparser_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing phoneparser stub. +; +; Languages +&EN + +; Header +#{"PhoneParser"}, (0x100058E4), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\PhoneParser.dll" diff -r 2fa1fa551b0b -r 78df25012fda telutils/phoneparser/rom/phoneparser_stub.sis Binary file telutils/phoneparser/rom/phoneparser_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda telutils/telephonyservice/group/bld.inf --- a/telutils/telephonyservice/group/bld.inf Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/telephonyservice/group/bld.inf Fri Sep 17 17:09:13 2010 +0300 @@ -21,9 +21,9 @@ DEFAULT PRJ_EXPORTS - +../rom/telephonyservice_stub.sis /epoc32/data/z/system/install/telephonyservice_stub.sis // IBY file exports -../rom/telephonyservice.iby CORE_MW_LAYER_IBY_EXPORT_PATH(telephonyservice.iby) +../rom/telephonyservice.iby CORE_MW_LAYER_IBY_EXPORT_PATH(telephonyservice.iby) // SIS stubs diff -r 2fa1fa551b0b -r 78df25012fda telutils/telephonyservice/group/telephonyservice.mmp --- a/telutils/telephonyservice/group/telephonyservice.mmp Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/telephonyservice/group/telephonyservice.mmp Fri Sep 17 17:09:13 2010 +0300 @@ -26,6 +26,7 @@ CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT +VERSION 10.0 SOURCEPATH ../src SOURCE ccallinformation.cpp diff -r 2fa1fa551b0b -r 78df25012fda telutils/telephonyservice/rom/telephonyservice.iby --- a/telutils/telephonyservice/rom/telephonyservice.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/telephonyservice/rom/telephonyservice.iby Fri Sep 17 17:09:13 2010 +0300 @@ -18,8 +18,8 @@ #ifndef __TelephonyService_IBY__ #define __TelephonyService_IBY__ -file=ABI_DIR\BUILD_DIR\telephonyservice.dll System\libs\telephonyservice.dll -//data=ZSYSTEM\install\phoneparser_stub.sis System\Install\phoneparser_stub.sis +file=ABI_DIR\BUILD_DIR\telephonyservice.dll System\libs\telephonyservice.dll +data=ZSYSTEM\install\telephonyservice_stub.sis System\Install\telephonyservice_stub.sis #endif diff -r 2fa1fa551b0b -r 78df25012fda telutils/telephonyservice/rom/telephonyservice_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/telephonyservice/rom/telephonyservice_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,29 @@ +; +; Copyright (c) 2009 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: For packing phoneparser stub. +; +; Languages +&EN + +; Header +#{"telephonyservice"}, (0x102078F4), 1, 0, 0, TYPE=SA + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +;Files +""-"z:\sys\bin\telephonyservice.dll" diff -r 2fa1fa551b0b -r 78df25012fda telutils/telephonyservice/rom/telephonyservice_stub.sis Binary file telutils/telephonyservice/rom/telephonyservice_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda telutils/xqtelephonyservice/rom/xqtelephonyservice.iby --- a/telutils/xqtelephonyservice/rom/xqtelephonyservice.iby Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/xqtelephonyservice/rom/xqtelephonyservice.iby Fri Sep 17 17:09:13 2010 +0300 @@ -18,7 +18,8 @@ #ifndef __XQTELEPHONYSERVICE_IBY__ #define __XQTELEPHONYSERVICE_IBY__ -file=ABI_DIR\BUILD_DIR\xqtelephonyservice.dll System\libs\xqtelephonyservice.dll +file=ABI_DIR\BUILD_DIR\xqtelephonyservice.dll System\libs\xqtelephonyservice.dll +data=ZSYSTEM\install\xqtelephonyservice_stub.sis System\Install\xqtelephonyservice_stub.sis #endif // __XQTELEPHONYSERVICE_IBY__ diff -r 2fa1fa551b0b -r 78df25012fda telutils/xqtelephonyservice/rom/xqtelephonyservice_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telutils/xqtelephonyservice/rom/xqtelephonyservice_stub.pkg Fri Sep 17 17:09:13 2010 +0300 @@ -0,0 +1,30 @@ +; +; Copyright (c) 2009 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: For packing phone contact finder stub. +; +; Languages +&EN + + +; SIS header: name, uid, version +#{"xqtelephonyservice"},(0x20029F04),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +"" - "z:\sys\bin\xqtelephonyservice.dll" + diff -r 2fa1fa551b0b -r 78df25012fda telutils/xqtelephonyservice/rom/xqtelephonyservice_stub.sis Binary file telutils/xqtelephonyservice/rom/xqtelephonyservice_stub.sis has changed diff -r 2fa1fa551b0b -r 78df25012fda telutils/xqtelephonyservice/xqtelephonyservice.pro --- a/telutils/xqtelephonyservice/xqtelephonyservice.pro Fri Sep 03 13:59:20 2010 +0300 +++ b/telutils/xqtelephonyservice/xqtelephonyservice.pro Fri Sep 17 17:09:13 2010 +0300 @@ -23,6 +23,7 @@ TARGET.EPOCALLOWDLLDATA = 1 TARGET.UID3 = 0x20029F04 DEFINES += BUILD_XQCALLINFO + VERSION = 10.0 INCLUDEPATH += ../../inc INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE @@ -46,6 +47,9 @@ headers.sources = inc/qtphonesrvlog.h headers.path = |../../inc for(header, headers.sources):BLD_INF_RULES.prj_exports += "$$header $$headers.path/$$basename(header)" + + BLD_INF_RULES.prj_exports += \ + "./rom/xqtelephonyservice_stub.sis /epoc32/data/z/system/install/xqtelephonyservice_stub.sis } # Input diff -r 2fa1fa551b0b -r 78df25012fda vmbx/vmbxengine/inc/vmbshandler.h --- a/vmbx/vmbxengine/inc/vmbshandler.h Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -/* -* Copyright (c) 2007-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" -* 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: Branding for voice mailbox - * -*/ - -#ifndef C_VMBSHANDLER_H -#define C_VMBSHANDLER_H - -// INCLUDES -#include -#include - - -// FORWARD DECLARATIONS - - -// CLASS DECLARATION - -/** - * CVmBSHandler declaration. - * - */ -NONSHARABLE_CLASS( CVmBSHandler ) : public CBase - { - -public: // Constructors and destructor - - /** - * Two-phased constructor. - */ - static CVmBSHandler* NewL(); - - /** - * Two-phased constructor. - */ - static CVmBSHandler* NewLC(); - - /** - * Destructor. - */ - virtual ~CVmBSHandler(); - -public: // New functions - - /** - * Get branded icon - * @param aBrandingId Brandind Id - * @param aBrandedBitmap Bitmap for branded icon - * @param aBrandedBitmapMask Mask to branded icon - */ -// void GetBrandedIconL( const TDesC8& aBrandingId, -// CFbsBitmap*& aBrandedBitmap, -// CFbsBitmap*& aBrandedBitmapMask ) const; - -private: - - /** - * C++ default constructor. - */ - CVmBSHandler(); - - /** - * By default Symbian 2nd phase constructor is private. - */ - void ConstructL(); - - }; - -#endif // C_VMBSHANDLER_H - -// End of file diff -r 2fa1fa551b0b -r 78df25012fda vmbx/vmbxengine/inc/vmbxvoipengine.h --- a/vmbx/vmbxengine/inc/vmbxvoipengine.h Fri Sep 03 13:59:20 2010 +0300 +++ b/vmbx/vmbxengine/inc/vmbxvoipengine.h Fri Sep 17 17:09:13 2010 +0300 @@ -28,7 +28,6 @@ class CVmbxEngineBase; //class CGulIcon; class CVmSPSHandler; -class CVmBSHandler; class TVmbxServiceInfo; //class CFbsBitmap; @@ -168,11 +167,6 @@ * Handles Service proviver Settings, Own. */ CVmSPSHandler* iVmSpsHandler; - - /** - * Handles Branding Server, Own. - */ - CVmBSHandler* iVmBsHandler; }; #endif // C_VMBXVOIPENGINE_H diff -r 2fa1fa551b0b -r 78df25012fda vmbx/vmbxengine/src/vmbshandler.cpp --- a/vmbx/vmbxengine/src/vmbshandler.cpp Fri Sep 03 13:59:20 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,170 +0,0 @@ -/* -* Copyright (c) 2009 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: Implementation of CVmBSHandler class. - * -*/ - -// INCLUDE FILES -#include -#include -#include -#include -#include -#include -#include -#include - -#include "vmsettingsuiiconfileprovider.h" -#include "vmbshandler.h" -#include "vmbxlogger.h" - - -// CONSTANTS used in VoIP branding, remove/update when branding is handled -// Branding server & data constants. -//const TInt KVmSettingsUiBrandingIconSize = 21; // icon size - -//_LIT8( KVmSettingsUiBSApplicationId, "xsp" ); // application id -//_LIT8( KVmSettingsUiBSIconId, "service_active_image_small" ); // icon id - - -// ============================ MEMBER FUNCTIONS ============================= - -// --------------------------------------------------------------------------- -// CVmBSHandler::CVmBSHandler -// C++ default constructor can NOT contain any code, that might leave. -// --------------------------------------------------------------------------- -// -CVmBSHandler::CVmBSHandler() - { - VMBLOGSTRING( "VMBX: CVmBSHandler::CVmBSHandler <=>" ); - } - -// --------------------------------------------------------------------------- -// CVmBSHandler::ConstructL -// Symbian 2nd phase constructor can leave. -// --------------------------------------------------------------------------- -// -void CVmBSHandler::ConstructL() - { - VMBLOGSTRING( "VMBX: CVmBSHandler::ConstructL <=>" ); - } - -// --------------------------------------------------------------------------- -// CVmBSHandler::NewL -// Two-phased constructor. -// --------------------------------------------------------------------------- -// -CVmBSHandler* CVmBSHandler::NewL( ) - { - VMBLOGSTRING( "VMBX: CVmBSHandler::NewL =>" ); - CVmBSHandler* self = CVmBSHandler::NewLC(); - CleanupStack::Pop( self ); - VMBLOGSTRING( "VMBX: CVmBSHandler::NewL <=" ); - return self; - } - -// --------------------------------------------------------------------------- -// CVmBSHandler::NewLC -// Two-phased constructor. -// --------------------------------------------------------------------------- -// -CVmBSHandler* CVmBSHandler::NewLC() - { - VMBLOGSTRING( "VMBX: CVmBSHandler::NewLC =>" ); - CVmBSHandler* self = new (ELeave) CVmBSHandler(); - CleanupStack::PushL( self ); - self->ConstructL(); - VMBLOGSTRING( "VMBX: CVmBSHandler::NewLC =>" ); - return self; - } - -// --------------------------------------------------------------------------- -// CVmBSHandler::NewLC -// Destructor -// --------------------------------------------------------------------------- -// -CVmBSHandler::~CVmBSHandler() - { - VMBLOGSTRING( "VMBX: CVmBSHandler::~CVmBSHandler <=>" ); - } - -// Commented out because branding is not supported yet. -// --------------------------------------------------------------------------- -// CVmBSHandler::GetBrandedIconL -// (other items were commented in a header). -// --------------------------------------------------------------------------- -// -// void CVmBSHandler::GetBrandedIconL( -// const TDesC8& aBrandingId, -// CFbsBitmap*& aBrandedBitmap, -// CFbsBitmap*& aBrandedBitmapMask ) const -// { -// VMBLOGSTRING( "VMBX: CVmBSHandler::GetBrandedIconL =>" ); -// // Create branding server factory and access to branding data. -// CBSFactory* factory = CBSFactory::NewL( -// aBrandingId, KVmSettingsUiBSApplicationId ); -// CleanupStack::PushL( factory ); -// -// MBSAccess* access = factory->CreateAccessL( -// aBrandingId, ELangInternationalEnglish ); -// CleanupClosePushL( *access ); -// -// // Get structure which contains bitmap information. -// MBSElement* element = access->GetStructureL( KVmSettingsUiBSIconId ); -// CleanupClosePushL( *element ); -// const CBSBitmap& bitmap = element->BitmapDataL(); -// -// // Open file which contains branded bitmaps. -// RFile file; -// CleanupClosePushL( file ); -// access->GetFileL( bitmap.BitmapFileId(), file ); -// -// // Try to load a skinned bitmap. -// if ( CCoeEnv::Static() ) -// { -// TAknsItemID itemId; -// itemId.Set( bitmap.SkinIdMajor(), bitmap.SkinIdMinor() ); -// MAknsSkinInstance* skin = AknsUtils::SkinInstance(); -// TRAP_IGNORE( ( aBrandedBitmap = -// AknsUtils::CreateBitmapL( skin, itemId ) ) ); -// } -// -// // If skinned bitmaps was not found, try to load bitmaps manually. -// if ( !aBrandedBitmap ) -// { -// CVmSettingsUiIconFileProvider* ifp = -// CVmSettingsUiIconFileProvider::NewL( file ); -// -// AknIconUtils::CreateIconL( -// aBrandedBitmap, -// aBrandedBitmapMask, -// *ifp, -// bitmap.BitmapId(), -// bitmap.BitmapMaskId() ); -// } -// -// // Set sizes. -// const TInt iconSize( KVmSettingsUiBrandingIconSize ); -// AknIconUtils::SetSize( aBrandedBitmap, TSize( iconSize, iconSize ) ); -// AknIconUtils::SetSize( aBrandedBitmapMask, TSize( iconSize, iconSize ) ); -// -// // Destroy some items. -// CleanupStack::PopAndDestroy( &file ); -// CleanupStack::PopAndDestroy( element ); -// CleanupStack::PopAndDestroy( access ); -// CleanupStack::PopAndDestroy( factory ); -// VMBLOGSTRING( "VMBX: CVmBSHandler::GetBrandedIconL <=" ); -// } - -// End of File diff -r 2fa1fa551b0b -r 78df25012fda vmbx/vmbxengine/src/vmbxqtuihandler.cpp --- a/vmbx/vmbxengine/src/vmbxqtuihandler.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/vmbx/vmbxengine/src/vmbxqtuihandler.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -359,12 +359,12 @@ VMBLOGSTRING2("VmbxQtUiHandler::showInformationNote type =%d", aType) switch (aType) { case EInvalidNumber: - // Need to comfirm with ui designer - noteText = hbTrId("Invalid phone number."); + // Invalid nubmer + noteText = hbTrId("txt_vmbx_dpopinfo_invalid_number"); break; case ENotAllowUserEditing: //User not allow to edit. - noteText = hbTrId("Number not provisioned"); + noteText = hbTrId("txt_vmbx_dpopinfo_voice_mailbox_not_provisioned"); break; case ESavedToPhoneMemory: case ESavedToSimMemory: diff -r 2fa1fa551b0b -r 78df25012fda vmbx/vmbxengine/src/vmbxvoipengine.cpp --- a/vmbx/vmbxengine/src/vmbxvoipengine.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/vmbx/vmbxengine/src/vmbxvoipengine.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -24,7 +24,6 @@ #include "vmbxuiutilities.h" #include "vmbxutilities.h" #include "vmspshandler.h" -#include "vmbshandler.h" #include "voicemailboxdefsinternal.h" #include "vmbxvoipengine.h" @@ -52,7 +51,6 @@ { VMBLOGSTRING( "VMBX: CVmbxVoIpEngine::~CVmbxVoIpEngine =>" ); delete iVmSpsHandler; - delete iVmBsHandler; VMBLOGSTRING( "VMBX: CVmbxVoIpEngine::~CVmbxVoIpEngine <=" ); } @@ -90,7 +88,6 @@ iVmSpsHandler = CVmSPSHandler::NewL(); } - iVmBsHandler = CVmBSHandler::NewL(); VMBLOGSTRING( "VMBX: CVmbxVoIpEngine::ConstructL <=" ); } @@ -281,9 +278,6 @@ CFbsBitmap*& aBrandedBitmap, CFbsBitmap*& aBrandedBitmapMask ) { VMBLOGSTRING( "VMBX: CVmbxVoIpEngine::GetBrandedIconL: =>" ); - - iVmBsHandler->GetBrandedIconL( - aBrandingId, aBrandedBitmap, aBrandedBitmapMask ); VMBLOGSTRING( "VMBX: CVmbxVoIpEngine::GetBrandedIconL: <=" ); } diff -r 2fa1fa551b0b -r 78df25012fda vmbx/vmbxengine/src/voicemailboximpl.cpp --- a/vmbx/vmbxengine/src/voicemailboximpl.cpp Fri Sep 03 13:59:20 2010 +0300 +++ b/vmbx/vmbxengine/src/voicemailboximpl.cpp Fri Sep 17 17:09:13 2010 +0300 @@ -31,7 +31,10 @@ #include "voicemailboximpl.h" // phone application uid -const TInt KPhoneApplicationUid = 0x100058B3; +// In TB9.2 phone application use 0x100058B3 +// In TB10.1 we get this value 101F4CD5 by testing. +// So use the value by testing +const TUint KPhoneApplicationUid = 0x101F4CD5; // ============================ MEMBER FUNCTIONS ============================= @@ -883,13 +886,12 @@ const TVoiceMailboxParams& aParams ) { VMBLOGSTRING( "VMBX: CVoiceMailboxImpl::CheckNumberProvisionedL =>" ); - if ( ( EVmbxVoice == aParams.iType - && EVmbxSimMemory == iCenRepHandler->StoreType() ) + if ( ( EVmbxVoice == aParams.iType ) || ( EVmbxVideo == aParams.iType ) ) { // get current active process RProcess curProcess; - TInt curProcessId( curProcess.SecureId().iId ); + TUint curProcessId( curProcess.SecureId().iId ); VMBLOGSTRING2( "VMBX: CVoiceMailboxImpl::CheckNumberProvisionedL \ Get cur process id: curProcessId = %I", curProcessId ); // User press 1+send key or long press 1 diff -r 2fa1fa551b0b -r 78df25012fda vmbx/vmbxengine/vmbxengine.pro --- a/vmbx/vmbxengine/vmbxengine.pro Fri Sep 03 13:59:20 2010 +0300 +++ b/vmbx/vmbxengine/vmbxengine.pro Fri Sep 17 17:09:13 2010 +0300 @@ -54,7 +54,6 @@ inc/mvmbxsimstoreobserver.h \ inc/mvmbxuihandler.h \ inc/mvmbxuiutilities.h \ - inc/vmbshandler.h \ inc/vmbxcenrephandler.h \ inc/vmbxcenrepobserver.h \ inc/vmbxcsvideoengine.h \ @@ -85,7 +84,6 @@ src/vmbxcsvoiceengine.cpp \ src/vmbxcsvideoengine.cpp \ src/vmbxcenrephandler.cpp \ - src/vmbshandler.cpp \ src/cvoicemailboxentry.cpp \ src/cvoicemailbox.cpp \ src/voicemailboximpl.cpp \