# HG changeset patch # User hgs # Date 1287986908 -19800 # Node ID 9f85c58c059273fb013276422f7a0b9f673b2b10 # Parent ae69c2e8bc342d7ffabf78bcf87910c8cc729440 201043 diff -r ae69c2e8bc34 -r 9f85c58c0592 fotaapplication/doc/S60_3_1_FOTA_Engine_Design_C.doc Binary file fotaapplication/doc/S60_3_1_FOTA_Engine_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 fotaapplication/doc/S60_MiniOS_Guide_C.doc Binary file fotaapplication/doc/S60_MiniOS_Guide_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 fotaapplication/fotaserver/src/fotafullscreendialog.cpp --- a/fotaapplication/fotaserver/src/fotafullscreendialog.cpp Fri Oct 15 11:46:45 2010 +0530 +++ b/fotaapplication/fotaserver/src/fotafullscreendialog.cpp Mon Oct 25 11:38:28 2010 +0530 @@ -17,6 +17,7 @@ #include "fotafullscreendialog.h" +#include #include #include #include @@ -161,12 +162,12 @@ { TReal sizeMB = sizeKB / 1024; Math::Round(sizeRounded,sizeMB,2); - content = hbTrId("txt_device_update_info_new_device_software_availab_Mb") .arg(aName) .arg(version).arg(sizeRounded); + content = HbParameterLengthLimiter("txt_device_update_info_new_device_software_availab_Mb").arg(aName).arg(version).arg(sizeRounded); } else { Math::Round(sizeRounded,sizeKB,2); - content = hbTrId("txt_device_update_info_new_device_software_availab_Kb") .arg(aName) .arg(version).arg(sizeRounded); + content = HbParameterLengthLimiter("txt_device_update_info_new_device_software_availab_Kb").arg(aName).arg(version).arg(sizeRounded); } m_SwDetails->setPlainText(content); diff -r ae69c2e8bc34 -r 9f85c58c0592 omaprovisioning/provisioning/Doc/S60_OMA_Provisioning_Design_C.doc Binary file omaprovisioning/provisioning/Doc/S60_OMA_Provisioning_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 omaprovisioning/provisioning/Group/bld.inf --- a/omaprovisioning/provisioning/Group/bld.inf Fri Oct 15 11:46:45 2010 +0530 +++ b/omaprovisioning/provisioning/Group/bld.inf Mon Oct 25 11:38:28 2010 +0530 @@ -53,6 +53,11 @@ ../ProvisioningParser/Group/ProvisioningParser.mmp ../ProvisioningHandler/Group/ProvisioningHandler.mmp +#ifdef __SMART_CARD_PROV +../ProvisioningSC/Group/ProvisioningSC.mmp +#endif + + PRJ_TESTMMPFILES // End of File diff -r ae69c2e8bc34 -r 9f85c58c0592 omaprovisioning/provisioning/ProvisioningSC/Src/CWPProvisioningSC.cpp --- a/omaprovisioning/provisioning/ProvisioningSC/Src/CWPProvisioningSC.cpp Fri Oct 15 11:46:45 2010 +0530 +++ b/omaprovisioning/provisioning/ProvisioningSC/Src/CWPProvisioningSC.cpp Mon Oct 25 11:38:28 2010 +0530 @@ -272,13 +272,13 @@ Dll::FileName( fileName ); #endif - HBufC* memLowText = WPAdapterUtil::ReadHBufCL( fileName, + /*HBufC* memLowText = WPAdapterUtil::ReadHBufCL( fileName, KWPProvSCName, R_TEXT_MEM_SUCS ); CleanupStack::PushL( memLowText ); // 1 CAknGlobalNote* note = CAknGlobalNote::NewLC(); // 2 note->ShowNoteL( EAknGlobalInformationNote, *memLowText ); - CleanupStack::PopAndDestroy( 2 ); // note, memLowText + CleanupStack::PopAndDestroy( 2 ); // note, memLowText*/ } // ----------------------------------------------------------------------------- diff -r ae69c2e8bc34 -r 9f85c58c0592 remotemgmt_plat/fota_engine_api/tsrc/docs/S60_5_1_FOTA_Engine_API_Test_D1a.doc Binary file remotemgmt_plat/fota_engine_api/tsrc/docs/S60_5_1_FOTA_Engine_API_Test_D1a.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 remotemgmt_plat/oma_ds_extensions_api/tsrc/docs/oma_ds_extensions_readme.doc Binary file remotemgmt_plat/oma_ds_extensions_api/tsrc/docs/oma_ds_extensions_readme.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 remotemgmt_plat/policy_management_certificate_api/tsrc/data/50_TARM_Build.doc Binary file remotemgmt_plat/policy_management_certificate_api/tsrc/data/50_TARM_Build.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 remotemgmt_plat/policy_management_request_api/tsrc/data/50_TARM_Build.doc Binary file remotemgmt_plat/policy_management_request_api/tsrc/data/50_TARM_Build.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 remotemgmt_plat/scp_server_api/tsrc/data/50_TARM_Build.doc Binary file remotemgmt_plat/scp_server_api/tsrc/data/50_TARM_Build.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 remotemgmt_plat/setting_enforcement_info_api/tsrc/data/50_TARM_Build.doc Binary file remotemgmt_plat/setting_enforcement_info_api/tsrc/data/50_TARM_Build.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 remotemgmt_plat/terminal_security_device_lock_api/tsrc/data/50_TARM_Build.doc Binary file remotemgmt_plat/terminal_security_device_lock_api/tsrc/data/50_TARM_Build.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 syncmlfw/doc/S60_3_1_SyncML_Common_Agent_Design_C.doc Binary file syncmlfw/doc/S60_3_1_SyncML_Common_Agent_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 syncmlfw/doc/S60_3_1_SyncML_Device_Management_Agent_Design_C.doc Binary file syncmlfw/doc/S60_3_1_SyncML_Device_Management_Agent_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 syncmlfw/doc/S60_3_1_SyncML_Device_Management_DevDetail_Adapter_Design_C.doc Binary file syncmlfw/doc/S60_3_1_SyncML_Device_Management_DevDetail_Adapter_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 syncmlfw/doc/S60_3_1_SyncML_Device_Management_Host_Server_Design_C.doc Binary file syncmlfw/doc/S60_3_1_SyncML_Device_Management_Host_Server_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 syncmlfw/doc/S60_3_1_SyncML_Device_Management_Tree_Module_Design_C.doc Binary file syncmlfw/doc/S60_3_1_SyncML_Device_Management_Tree_Module_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 syncmlfw/doc/S60_3_1_SyncML_Symbian_OS_Server_Design_C.doc Binary file syncmlfw/doc/S60_3_1_SyncML_Symbian_OS_Server_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 syncmlfw/doc/S60_SyncML_Device_Management_Functional_Description_C.doc Binary file syncmlfw/doc/S60_SyncML_Device_Management_Functional_Description_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 terminalsecurity/SCP/doc/S60_3_1_TARM_SCP_Device_Lock_Enhancements_Users_Guide_C.doc Binary file terminalsecurity/SCP/doc/S60_3_1_TARM_SCP_Device_Lock_Enhancements_Users_Guide_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 terminalsecurity/SCP/doc/S60_3_1_Terminal_Administrator_Rights_Model_Security_Code_Proxy_Server_Design_C.doc Binary file terminalsecurity/SCP/doc/S60_3_1_Terminal_Administrator_Rights_Model_Security_Code_Proxy_Server_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 terminalsecurity/doc/S60_3_1_Device_Management_Terminal_Security_Adapter_Design_C.doc Binary file terminalsecurity/doc/S60_3_1_Device_Management_Terminal_Security_Adapter_Design_C.doc has changed diff -r ae69c2e8bc34 -r 9f85c58c0592 terminalsecurity/doc/S60_3_1_Device_Management_Terminal_Security_Design_C.doc Binary file terminalsecurity/doc/S60_3_1_Device_Management_Terminal_Security_Design_C.doc has changed