# HG changeset patch # User William Roberts # Date 1279813092 -3600 # Node ID f8ad95794a08780daebcd9e7130d64f8ee56e0c3 # Parent 1347d5cca6af144edb3158c6fea2cb772eba5b3c# Parent 61f466445ae5dd4f85c6259a3c6ea9fb4da67432 Catchup to latest Symbian^4 diff -r 1347d5cca6af -r f8ad95794a08 group/bld.inf --- a/group/bld.inf Thu Jun 17 11:58:38 2010 +0100 +++ b/group/bld.inf Thu Jul 22 16:38:12 2010 +0100 @@ -17,5 +17,4 @@ #include "../msgfw_plat/group/bld.inf" //#include "../msgfw_pub/group/bld.inf" -#include "../msgbranched/group/bld.inf" #include "../messagingfw/group/bld.inf" diff -r 1347d5cca6af -r f8ad95794a08 layers.sysdef.xml diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/BMARM/alwaysonlinemanagerserveru.def diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/group/AlwaysOnlineManagerServer.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManager.h diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManagerDiskSpaceObserver.h diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManager.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManagerDiskSpaceObserver.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/alwaysonline/group/bld.inf --- a/messagingfw/alwaysonline/group/bld.inf Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/alwaysonline/group/bld.inf Thu Jul 22 16:38:12 2010 +0100 @@ -28,7 +28,7 @@ ../rom/AlwaysOnline.iby CORE_MW_LAYER_IBY_EXPORT_PATH(AlwaysOnline.iby) // Stub installer file which enables eclipsing of always online manager -../sis/aomanagerstub.sis /epoc32/data/z/system/install/aomanagerstub.SIS +../sis/aomanagerstub.SIS /epoc32/data/z/system/install/aomanagerstub.SIS PRJ_MMPFILES ../AlwaysOnlineManager/group/AlwaysOnlineManagerServer.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/alwaysonline/rom/AlwaysOnline.iby --- a/messagingfw/alwaysonline/rom/AlwaysOnline.iby Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/alwaysonline/rom/AlwaysOnline.iby Thu Jul 22 16:38:12 2010 +0100 @@ -24,7 +24,7 @@ file=ABI_DIR\BUILD_DIR\ALWAYSONLINESTARTER.exe PROGRAMS_DIR\ALWAYSONLINESTARTER.exe // Stub installer file -data=DATAZ_\system\install\aomanager_stub.sis system\install\aomanager_stub.sis +data=DATAZ_\system\install\aomanagerstub.SIS system\install\aomanagerstub.SIS #endif diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BDB/BLD.INF --- a/messagingfw/biomsgfw/BDB/BLD.INF Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/biomsgfw/BDB/BLD.INF Thu Jul 22 16:38:12 2010 +0100 @@ -30,4 +30,4 @@ ../BDBTSRC/T_BdbHF.MMP manual ../BDBTSRC/t_bio_observer.mmp -#include "../BDBTSRC/testbif/BLD.INF" +#include "../BDBTSRC/testbif/bld.inf" diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BDB/group/BIODB.MMP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BITS/BITS.MMP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BITSTSRC/T_BIOLOG.MMP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BIUT/BLD.INF diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BIUT/group/BIUT.MMP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BIUTTSRC/T_BIOMSG.MMP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BIUTTSRC/t_ipaddr.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BioWatchers/BLD.INF diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BioWatchers/Test/T_NbsWatcher.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/BioWatchers/Test/T_WapWatcher.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/CBCPTSRC/T_CBCP.MMP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/IACPTSRC/T_DB.MMP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/group/BLD.INF --- a/messagingfw/biomsgfw/group/BLD.INF Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/biomsgfw/group/BLD.INF Thu Jul 22 16:38:12 2010 +0100 @@ -25,23 +25,23 @@ DEFAULT // The following are build for WINC -#include "../BIFU/BLD.INF" +#include "../BIFU/bld.inf" // These lot are not #if !defined(WINC) -#include "../BIUT/BLD.INF" -#include "../BDB/BLD.INF" -#include "../BIOC/BLD.INF" -#include "../BIOS/BLD.INF" -#include "../BITS/BLD.INF" +#include "../BIUT/bld.inf" +#include "../BDB/bld.inf" +#include "../BIOC/bld.inf" +#include "../BIOS/bld.inf" +#include "../BITS/bld.inf" #include "../cbcp/bld.inf" #include "../iacp/bld.inf" #include "../enp/bld.inf" #include "../wapp/bld.inf" #include "../gfp/bld.inf" -#include "../BioWatchers/BLD.INF" -#include "../Rom/BLD.INF" +#include "../BioWatchers/bld.inf" +#include "../Rom/bld.inf" PRJ_EXPORTS bioerr.ra SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(errors/generic/bioerr.ra) diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/biomsgfw/group/messaging_biomsg.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/group/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgcommonutils/group/eabiU.def diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgcommonutils/group/msgcommonutils.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgcommonutils/group/winsu.def diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgcommonutils/rom/msgcommonutils.iby --- a/messagingfw/msgcommonutils/rom/msgcommonutils.iby Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgcommonutils/rom/msgcommonutils.iby Thu Jul 22 16:38:12 2010 +0100 @@ -21,6 +21,5 @@ // msgcommonutils // file=ABI_DIR\BUILD_DIR\msgcommonutils.dll SHARED_LIB_DIR\msgcommonutils.dll -data=DATAZ_\RESOURCE_FILES_DIR\msgcommonutils.rsc RESOURCE_FILES_DIR\msgcommonutils.rsc #endif // __MSGCOMMONUTILS_IBY__ diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgcommonutils/src/MsgVoIPExtension.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgcommonutils/src/javaprotectionresolver.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgcommonutils/src/javaprotectionresolverstub.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgconf/group/messaging_config.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgconf/group/messaging_config.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/group/bld.inf --- a/messagingfw/msgsrvnstore/group/bld.inf Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgsrvnstore/group/bld.inf Thu Jul 22 16:38:12 2010 +0100 @@ -15,7 +15,7 @@ #include "../mtmbase/group/bld.inf" #include "../server/group/bld.inf" -#include "../serverexe/group/BLD.INF" +#include "../serverexe/group/bld.inf" PRJ_EXPORTS msgerr.ra SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(errors/generic/msgerr.ra) diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/group/messaging_framework.history.xml diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/group/messaging_framework.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/mtmbase/test/group/T_ui.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/group/MSGS.mmp --- a/messagingfw/msgsrvnstore/server/group/MSGS.mmp Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgsrvnstore/server/group/MSGS.mmp Thu Jul 22 16:38:12 2010 +0100 @@ -19,6 +19,7 @@ @file */ +#include TARGET msgs.dll TARGETTYPE dll @@ -99,6 +100,7 @@ START RESOURCE MSGS.rss TARGETPATH resource/messaging +TARGET MSGS.rsc HEADER LANG SC END @@ -166,6 +168,7 @@ #endif #endif +OS_LAYER_SYSTEMINCLUDE diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/group/MSGS.rss --- a/messagingfw/msgsrvnstore/server/group/MSGS.rss Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgsrvnstore/server/group/MSGS.rss Thu Jul 22 16:38:12 2010 +0100 @@ -14,7 +14,8 @@ // #include "msgs.rls" -#include "../inc/MSVSTD.HRH" +#include +#include // Flags - defined in TMsvEntry @@ -59,32 +60,42 @@ parent=KMsvRootIndexEntryIdValue; type=KUidMsvServiceEntryValue; flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=STRING_r_server_index_startup1; }, + details="Local"; }, SERVERENTRY { id=KMsvGlobalInBoxIndexEntryIdValue; parent=KMsvLocalServiceIndexEntryIdValue; type=KUidMsvFolderEntryValue; flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=STRING_r_server_index_startup2; }, + details=qtn_mce_inbox; }, SERVERENTRY { id=KMsvGlobalOutBoxIndexEntryIdValue; parent=KMsvLocalServiceIndexEntryIdValue; type=KUidMsvFolderEntryValue; flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=STRING_r_server_index_startup3; }, + details=qtn_mce_outbox; }, SERVERENTRY { id=KMsvDraftEntryIdValue; parent=KMsvLocalServiceIndexEntryIdValue; type=KUidMsvFolderEntryValue; flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=STRING_r_server_index_startup4; }, + details=qtn_mce_drafts; }, SERVERENTRY { id=KMsvSentEntryIdValue; parent=KMsvLocalServiceIndexEntryIdValue; type=KUidMsvFolderEntryValue; flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=STRING_r_server_index_startup5; }, + details=qtn_mce_sent_items; }, + SERVERENTRY { id=0x1008; + parent=KMsvLocalServiceIndexEntryIdValue; + type=KUidMsvFolderEntryValue; + flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; + details=qtn_mce_documents; }, + SERVERENTRY { id=0x1009; + parent=0x1008; + type=KUidMsvFolderEntryValue; + flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; + details=qtn_mce_doc_temp_folder; }, SERVERENTRY { id=KMsvDeletedEntryFolderEntryIdValue; parent=KMsvLocalServiceIndexEntryIdValue; type=KUidMsvFolderEntryValue; flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder|KMsvEntryInvisibleFlag; - details=STRING_r_server_index_startup6; } + details="Deleted"; } }; } diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/group/MSGS_AutoShutdown.mmp --- a/messagingfw/msgsrvnstore/server/group/MSGS_AutoShutdown.mmp Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgsrvnstore/server/group/MSGS_AutoShutdown.mmp Thu Jul 22 16:38:12 2010 +0100 @@ -19,6 +19,7 @@ /** @file */ +#include @@ -103,6 +104,7 @@ START RESOURCE MSGS.rss TARGETPATH resource/messaging +TARGET MSGS.rsc HEADER LANG SC END @@ -170,6 +172,7 @@ #endif #endif +OS_LAYER_SYSTEMINCLUDE diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/group/bld.inf --- a/messagingfw/msgsrvnstore/server/group/bld.inf Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgsrvnstore/server/group/bld.inf Thu Jul 22 16:38:12 2010 +0100 @@ -14,6 +14,7 @@ // bld.inf // +#include PRJ_PLATFORMS DEFAULT @@ -115,6 +116,12 @@ msgPriorityDriveList.ini z:/private/1000484b/msgprioritydrivelist.ini #endif // #if (defined SYMBIAN_MSGS_ENHANCED_REMOVABLE_MEDIA_SUPPORT) +//IBY exports +../rom/messageserver_rsc.iby LANGUAGE_OS_LAYER_IBY_EXPORT_PATH(messageserver_rsc.iby) +../rom/messageserver.hby CORE_OS_LAYER_IBY_EXPORT_PATH(messageserver.hby) + + +../loc/msgs.loc OS_LAYER_LOC_EXPORT_PATH(msgs.loc) PRJ_MMPFILES MSGS.mmp MSGS_AutoShutdown.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/inc/MSVROPS.H diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/inc/MSVROPS.INL diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/inc/MSVSERV.H diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/inc/msvsearchsortcachemanager.h diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/loc/msgs.loc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/messagingfw/msgsrvnstore/server/loc/msgs.loc Thu Jul 22 16:38:12 2010 +0100 @@ -0,0 +1,61 @@ +/* +* Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* This file contains the localised strings for msgs +* +*/ + + + +// LOCALISATION STRINGS + +// d: Main view list item. +// d: Inbox +// l: list_single_large_graphic_pane_t1 +// +#define qtn_mce_inbox "Inbox" + +// d: Main view list item. +// d: Documents +// l: list_single_large_graphic_pane_t1 +// +#define qtn_mce_documents "Documents" + +// d: Main view list item. +// d: Drafts +// l: list_single_large_graphic_pane_t1 +// +#define qtn_mce_drafts "Drafts" + +// d: Main view list item. +// d: Sent items +// l: list_single_large_graphic_pane_t1 +// +#define qtn_mce_sent_items "Sent items" + +// d: Main view list item. +// d: Outbox +// l: list_single_large_graphic_pane_t1 +// +#define qtn_mce_outbox "Outbox" + +// d: Documents view list item. First item of the list when Documents folder is opened. +// l: list_double_graphic_pane_t1 +// +#define qtn_mce_doc_temp_folder "Templates" + + +// End of File + + diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/rom/messageserver.hby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/messagingfw/msgsrvnstore/server/rom/messageserver.hby Thu Jul 22 16:38:12 2010 +0100 @@ -0,0 +1,9 @@ +#ifndef __MESSAGESERVER_HBY__ +#define __MESSAGESERVER_HBY__ + +// +// Moved to \s60\mce\rom\messageserver_rsc.iby +// +//data=MULTI_LINGUIFY(RSC DATAZ_\resource\messaging\MSGS resource\messaging\MSGS) + +#endif diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/rom/messageserver_rsc.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/messagingfw/msgsrvnstore/server/rom/messageserver_rsc.iby Thu Jul 22 16:38:12 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 2004 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: Defines Series60 localized files +* +*/ + + + +#ifndef __MESSAGESERVER_RSC_IBY__ +#define __MESSAGESERVER_RSC_IBY__ + +//Resource file(s) for Message server +data=DATAZ_\MTM_RESOURCE_DIR\msgs.rsc MTM_RESOURCE_DIR\msgs.rsc +#endif diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/MSVSERV.CPP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/MSVSESS.CPP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/MSVTIME.CPP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/cmsvconverterwaiter.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/diskchange.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/msvsearchsortcachemanager.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_visiblefolder_step.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/base/group/OBSEXE1.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/base/group/OBSEXE2.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/base/src/TESTSMTM.CPP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/testrom/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/unit/group/t_msgs_backup.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/group/bld.inf --- a/messagingfw/msgtest/group/bld.inf Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgtest/group/bld.inf Thu Jul 22 16:38:12 2010 +0100 @@ -13,7 +13,7 @@ // Description: // -#include "../testutils/group/BLD.INF" +#include "../testutils/group/bld.inf" #include "../tools/group/bld.inf" #include "../integration/group/bld.inf" #include "../testsuites/group/bld.inf" diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/group/messaging_test.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/BLD.INF diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/Delay/BLD.INF diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/Delay/T_delay.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/Rom/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/Script/autotest.txt diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/SerialLog/BLD.INF diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/SerialLog/T_seriallog.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/StayAwake/StayAwake.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/StayAwake/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/TechviewStart/Start.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/TechviewStart/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/targetautomation/TechviewStart/start.rpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/testrom/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/testutils/base/test/group/t_testutils.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/testutils/sms/test/group/MsgScriptsTest.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtest/tools/group/bld.inf --- a/messagingfw/msgtest/tools/group/bld.inf Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgtest/tools/group/bld.inf Thu Jul 22 16:38:12 2010 +0100 @@ -13,7 +13,7 @@ // Description: // -#include "../autorun/group/BLD.INF" -#include "../copylogs/group/BLD.INF" +#include "../autorun/group/bld.inf" +#include "../copylogs/group/bld.inf" #include "../utils/group/bld.inf" -#include "../spoofserver/group/Bld.inf" +#include "../spoofserver/group/bld.inf" diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/TestActions/Capabilities/inc/CMtfTestActionSendEMsvNotifySessionEvent.h diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/TestActions/Capabilities/src/CMtfTestActionSendEMsvNotifySessionEvent.cpp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/CapUtils.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/MessagingTestServerDebug.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/messaging_testframework.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/mts_attachment.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/mts_base.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/mts_email.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/mts_nonscripted_testcase.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/mts_sample.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/mts_sms_mms.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestfw/group/mts_utils.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestproduct/burtestserver/group/burtestserver.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestproduct/email/imap/group/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestproduct/email/pop/group/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestproduct/framework/group/T_MsgFramework.mph diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtestproduct/group/messaging_testproduct.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtests/group/bld.inf --- a/messagingfw/msgtests/group/bld.inf Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/msgtests/group/bld.inf Thu Jul 22 16:38:12 2010 +0100 @@ -31,8 +31,8 @@ // These lot are not #if !defined(WINC) #include "../../msgconf/group/bld.inf" -#include "../../biomsgfw/group/BLD.INF" -#include "../../biomsgfw/T_BIOMSG/Group/BLD.INF" +#include "../../biomsgfw/group/bld.inf" +#include "../../biomsgfw/T_BIOMSG/Group/bld.inf" #include "../../msgsrvnstore/group/bld.inf" #include "../../watcherfw/group/bld.inf" #include "../../scheduledsendmtm/group/bld.inf" diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgtests/group/messaging.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgurlhandler/group/messaging_urlhandler.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/msgurlhandler/test/ui/group/TestHandler.MMP diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvSchedulePackage.h --- a/messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvSchedulePackage.h Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvSchedulePackage.h Thu Jul 22 16:38:12 2010 +0100 @@ -16,6 +16,9 @@ #ifndef MSV_SCHEDULE_PACKAGE_H_ #define MSV_SCHEDULE_PACKAGE_H_ +#include +#include + // // // TMsvSchedulePackage Declaration diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/scheduledsendmtm/test/unit/group/T_schsend1.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/sendas/group/messaging_sendas2.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/sendas/test/sendastextnotifier/group/sendasUInotifier.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/MiscPushMsgUtils/group/Miscpushmsgutils.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/MiscPushMsgUtils/inc/CMultipartBinIterator.h diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/MiscPushMsgUtils/inc/cmultiparttextiterator.h diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/PushMsgEntry/group/Pushmsgentry.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/siattributetable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/siattributevaluetable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/sitagstable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/slattributetable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/slattributevaluetable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/sltagstable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/SISLPushMsgUtils/group/SISLPushMsgUtils.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/examples/PushAppHandlerEx/BLD.INF diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/examples/PushAppHandlerEx/PushAppHandlerEx.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/examples/PushAppHandlerEx/test/t_push.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/group/BLD.INF diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/group/wap-browser_wappush.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeTable.mak diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeValueTable.mak diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00TagTable.mak diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeTable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeValueTable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00TagTable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeTable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeValueTable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00TagTable.st diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/plugins/group/Sl1_0StringDict00.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/pushmtm/group/pushmtmclientserver.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/pushmtm/test/t_pushmtm.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/pushutils/group/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/pushutils/group/pushutils.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/pushutils/inc/PushDispatcher.h diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/pushutils/test/t_failure.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/pushutils/test/t_filter.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/pushwatcher/group/pushwatcher.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/tpush/DummyStack/Dummywapstack.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/tpush/t_pushmsggen.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/wappushfw/tpushscriptbased/testdata/ineturilist.xml diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/watcherfw/group/messaging_watcher.mrp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/watcherfw/group/watcher.mmp --- a/messagingfw/watcherfw/group/watcher.mmp Thu Jun 17 11:58:38 2010 +0100 +++ b/messagingfw/watcherfw/group/watcher.mmp Thu Jul 22 16:38:12 2010 +0100 @@ -50,7 +50,7 @@ LIBRARY flogger.lib #endif -DEFFILE V2_WATCHER.DEF +DEFFILE V2_watcher.DEF VENDORID 0x70000001 diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/watcherfw/test/group/ecomtestwatcher.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/watcherfw/test/group/t_forever.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/watcherfw/test/group/t_watcher.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingfw/watcherfw/test/group/testwatcher.mmp diff -r 1347d5cca6af -r f8ad95794a08 messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/group/bld.inf --- a/msgbranched/group/bld.inf Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* -* Copyright (c) 2006 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: -* BLD.INF file for msgbranched. -* -*/ - - - -#include - - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -//IBY exports -../rom/messageserver_rsc.iby LANGUAGE_OS_LAYER_IBY_EXPORT_PATH(messageserver_rsc.iby) -../rom/gtemailmtmResources.iby LANGUAGE_OS_LAYER_IBY_EXPORT_PATH(gtemailmtmResources.iby) -../rom/gtemailmtm.hby CORE_OS_LAYER_IBY_EXPORT_PATH(gtemailmtm.hby) -../rom/messageserver.hby CORE_OS_LAYER_IBY_EXPORT_PATH(messageserver.hby) - - -// export localised loc file -../messagingbr/emailbr/clientmtms/loc/imcm.loc OS_LAYER_LOC_EXPORT_PATH(imcm.loc) -../messagingbr/emailbr/clientmtms/loc/imcm_default_charset.loc OS_LAYER_LOC_EXPORT_PATH(imcm_default_charset.loc) -../messagingbr/frameworkbr/server/loc/msgs.loc OS_LAYER_LOC_EXPORT_PATH(msgs.loc) - -PRJ_MMPFILES -./msgbranched.mmp - -/* End of File */ - diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/group/dummy.cpp --- a/msgbranched/group/dummy.cpp Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +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: dummy implementation -* -*/ - - - diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/group/msgbranched.mmp --- a/msgbranched/group/msgbranched.mmp Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -/* -* Copyright (c) 2006 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: -* This is project specification file for msgbranched. -* -*/ - - - -#include - -TARGET msgbranched.lib -TARGETTYPE lib -UID 0x0 0x0 - -START RESOURCE ../messagingbr/emailbr/clientmtms/group/imcm.rss -LANGUAGE_IDS -HEADER -TARGETPATH resource/messaging -END - -START RESOURCE ../messagingbr/frameworkbr/server/group/msgs.rss -LANGUAGE_IDS -HEADER -TARGETPATH resource/messaging -END - -START RESOURCE ../nbprotocols/smsstack/smsu/group/smsu.rss -LANGUAGE_IDS -HEADER -TARGETPATH private/101f7989/sms -END - -SOURCE dummy.cpp - -USERINCLUDE ../messagingbr/emailbr/clientmtms/group -USERINCLUDE ../messagingbr/frameworkbr/server/group -USERINCLUDE ../nbprotocols/smsstack/smsu/group - -OS_LAYER_SYSTEMINCLUDE - -// End of file diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/messagingbr/emailbr/clientmtms/group/imcm.rls --- a/msgbranched/messagingbr/emailbr/clientmtms/group/imcm.rls Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* -* Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: imcm.rls* -*/ - - - -rls_string STRING_forward_formatting_string1 "Fwd: %S" -rls_string STRING_reply_formatting_string1 "Re: %S" -rls_string STRING_receipt_formatting_string1 "Receipt of message: %S" -rls_string STRING_email_address_formatting_string1 "\"%S\" <%S>" -rls_string STRING_forward_body_header1 <0x2029><0x2029>"_______________ Forward Header _______________"<0x2029> // Header used in Body for Forwarded message -rls_string STRING_forward_body_header2 "Subject:"<0x0009>"%S"<0x2029> -rls_string STRING_forward_body_header3 "Author:"<0x0009>"%S"<0x2029> -rls_string STRING_forward_body_header4 "Date:"<0x0009><0x0009>"%S"<0x2029> -rls_string STRING_forward_body_header5 "To:"<0x0009><0x0009>"%S"<0x2029> -rls_string STRING_forward_body_header6 "CC:"<0x0009><0x0009>"%S"<0x2029> -rls_string STRING_reply_body_header1 <0x2029><0x2029>"________________ Reply Header ________________"<0x2029> // Header used in Body for Replied message -rls_string STRING_reply_body_header2 "Subject:"<0x0009>"%S"<0x2029> -rls_string STRING_reply_body_header3 "Author:"<0x0009>"%S"<0x2029> -rls_string STRING_reply_body_header4 "Date:"<0x0009><0x0009>"%S"<0x2029> -rls_string STRING_reply_body_header5 "To:"<0x0009><0x0009>"%S"<0x2029> -rls_string STRING_reply_body_header6 "CC:"<0x0009><0x0009>"%S"<0x2029> -rls_string STRING_body_header1 <0x2029><0x2029>"_______________ Message Header _______________"<0x2029> // Header used in Body for message -rls_string STRING_body_header2 "Subject:"<0x0009>"%S"<0x2029> -rls_string STRING_body_header3 "Author:"<0x0009>"%S"<0x2029> -rls_string STRING_body_header4 "Recipient:"<0x0009>"%S"<0x2029> -rls_string STRING_body_header5 "Date:"<0x0009><0x0009>"%S"<0x2029> -rls_string STRING_removed_attachment_tag1 "Attachment not available : " -rls_string STRING_retained_attachment_tag1 "Attached file : " -rls_string STRING_default_attachment_name1 "Attachment" -rls_string STRING_product_name1 "EPOC Email Version 2.10" -rls_string STRING_timeout_dialog_title1 "Remote mailbox closed automatically" -rls_string STRING_timeout_dialog_text1 "Remote mailbox has been idle for specified time" -rls_string STRING_default_vcard_name1 "vcard" -rls_string STRING_body_header_datetime_format "%D%X%N%Y%1 %2 %3 %-B%:0%J%:1%T%:3%+B" // DateTime format used in forward/reply body header. This string is substituted in the %s paramter in STRING_forward_body_header4 and STRING_reply_body_header4. -rls_string STRING_partial_download_footer_message "This message has not been fully downloaded. There is still %d KB of text to be retrieved." -rls_string STRING_default_system_charset "ISO-8859-1" diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/messagingbr/emailbr/clientmtms/group/imcm.rss --- a/msgbranched/messagingbr/emailbr/clientmtms/group/imcm.rss Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -/* -* Copyright (c) 1998-2005 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: imcm.rss* -*/ - - - -#include "imcm.rls" -#include -#include - - -#define PARABREAK 8233 -#define TABCHAR 9 - -STRUCT LBUF - { - LTEXT buffer; // non-zero terminated text string - } - -STRUCT L8BUF - { - LTEXT8 buffer; - } - -STRUCT INT8 - { - BYTE value; - } - -RESOURCE LBUF forward_formatting_string - { - buffer=qtn_mail_fwd"%S"; - } - -RESOURCE LBUF reply_formatting_string - { - buffer=qtn_mail_re"%S"; - } - -RESOURCE LBUF receipt_formatting_string - { - buffer=STRING_receipt_formatting_string1; - } - -RESOURCE LBUF email_address_formatting_string - { - buffer="%S <%S>";//STRING_email_address_formatting_string1; - } - - -// Headers used in Body for Forwarded/Replyed message - -RESOURCE LBUF forward_body_header - { - buffer=qtn_mail_forward_separator - qtn_mail_copy_subject" %S" - qtn_mail_copy_sender" %S" - qtn_mail_copy_date" %S"; - } - -RESOURCE LBUF forward_body_header_toonly - { - buffer=STRING_forward_body_header1 - STRING_forward_body_header2 - STRING_forward_body_header3 - STRING_forward_body_header5 - STRING_forward_body_header4; - } - -RESOURCE LBUF forward_body_header_cconly - { - buffer=STRING_forward_body_header1 - STRING_forward_body_header2 - STRING_forward_body_header3 - STRING_forward_body_header6 - STRING_forward_body_header4; - } - -RESOURCE LBUF forward_body_header_tocc - { - buffer=STRING_forward_body_header1 - STRING_forward_body_header2 - STRING_forward_body_header3 - STRING_forward_body_header5 - STRING_forward_body_header6 - STRING_forward_body_header4; - } - -RESOURCE LBUF reply_body_header - { - buffer=qtn_mail_reply_separator - qtn_mail_copy_subject" %S" - qtn_mail_copy_sender" %S" - qtn_mail_copy_date" %S"; - } - -RESOURCE LBUF reply_body_header_toonly - { - buffer=STRING_reply_body_header1 - STRING_reply_body_header2 - STRING_reply_body_header3 - STRING_reply_body_header5 - STRING_reply_body_header4; - } - -RESOURCE LBUF reply_body_header_cconly - { - buffer=STRING_reply_body_header1 - STRING_reply_body_header2 - STRING_reply_body_header3 - STRING_reply_body_header6 - STRING_reply_body_header4; - } - -RESOURCE LBUF reply_body_header_tocc - { - buffer=STRING_reply_body_header1 - STRING_reply_body_header2 - STRING_reply_body_header3 - STRING_reply_body_header5 - STRING_reply_body_header6 - STRING_reply_body_header4; - } - -RESOURCE LBUF body_header - { - buffer=STRING_body_header1 - STRING_body_header2 - STRING_body_header3 - STRING_body_header4 - STRING_body_header5; - } - -RESOURCE LBUF removed_attachment_tag - { - buffer=STRING_removed_attachment_tag1; - } - -RESOURCE LBUF retained_attachment_tag - { - buffer=STRING_retained_attachment_tag1; - } - -RESOURCE LBUF default_attachment_name - { - buffer=STRING_default_attachment_name1; - } - -RESOURCE LBUF product_name - { - buffer=STRING_product_name1; - } - -RESOURCE LBUF timeout_dialog_title - { - buffer=STRING_timeout_dialog_title1; - } - -RESOURCE LBUF timeout_dialog_text - { - buffer=STRING_timeout_dialog_text1; - } - -RESOURCE LBUF default_vcard_name - { - buffer=STRING_default_vcard_name1; - } - -// List of available character sets in Charconv.h -// at some point flags should be removed and only qtn_default_charset be used for all builds. -RESOURCE L8BUF default_system_charset - { - buffer = qtn_default_email_charset; - } - -// If this value is set to 1, 8 bit body text data and character set information will be stored -// when downloaded via IMPS and POPS. The body text will be decoded to the correct character set -// when opened. If this value is set to 0, the body text is decoded and stored when downloading. -RESOURCE INT8 store_8bit_body_text - { - value = 1; - } - -// Used for localised date time formatting for email forward and reply body headers -RESOURCE LBUF body_header_datetime_format - { - buffer="%D%M%Y%/0%1%/1%2%/2%3%/3 %-B%:0%J%:1%T%:3%+B"; //STRING_body_header_datetime_format; - } - -RESOURCE LBUF partial_download_footer_message - { - buffer=qtn_mail_rest_of_mail_not_fetched; - } - -// If this value is set to 1,body text data will be stored when downloaded via IMPS and POPS using chunk storage option. -// If this value is set to 0, the body text is stored by creating entire message in RAM. - -RESOURCE INT8 store_plain_body_text - { - value = 1; - } diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/messagingbr/emailbr/clientmtms/loc/imcm.loc --- a/msgbranched/messagingbr/emailbr/clientmtms/loc/imcm.loc Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* Copyright (c) 2002 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: -* This is a localisation file for imcm.dll -* A .loc file is the one and only place where the logical strings -* to be localised are defined. -* >>> -* The text between >>> and <<< is just to document the syntax and -* you can remove it if you like. -* -*/ - - - - -// LOCALISATION STRINGS - -// d: Added in the beginning of the subject line when replying -// l: mce_header_field_pane_t1 -#define qtn_mail_re "RE: " - -// d: Added in the beginning of the subject line when forwarding -// l: mce_header_field_pane_t1 -#define qtn_mail_fwd "FWD: " - -// d: Text to be inserted into a message when replying -// d: Inerted in the beginning of the original message -// l: msg_header_pane_t2 -#define qtn_mail_reply_separator "--- original message ---" - -// d: Text to be inserted into a message when forwarding -// d: Inserted in the beginning of the original message -// l: msg_header_pane_t2 -#define qtn_mail_forward_separator "--- original message ---" - -// d: Text to be inserted into a message when forwarding or replying -// d: Inserted in the beginning of the original message -// l: msg_header_pane_t2 -#define qtn_mail_copy_subject "Subject:" - -// d: Text to be inserted into a message when forwarding or replying -// d: Inserted in the beginning of the original message -// l: msg_header_pane_t2 -#define qtn_mail_copy_sender "Sender:" - -// d: Text to be inserted into a message when forwarding or replying -// d: Inserted in the beginning of the original message -// l: msg_header_pane_t2 -#define qtn_mail_copy_date "Date:" - -// d: Text to be inserted into a message body if part of message body is filtered out -// l:none -#define qtn_mail_rest_of_mail_not_fetched "- - - Retrieve total mail selecting Retrieve from Options list. - - -" - -// End of File diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/messagingbr/emailbr/clientmtms/loc/imcm_default_charset.loc --- a/msgbranched/messagingbr/emailbr/clientmtms/loc/imcm_default_charset.loc Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* -* Copyright (c) 2002 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: -* !!!!!!!LOCALISATION INSTRUCTIONS, IMPORTANT!!!!!!! -* These default charsets are used to define correct default charsets for different builds. -* -*/ - - - -// d: This is not visible to the user! -// l: None -#define qtn_default_email_charset "ISO-8859-1" - -// End of File diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/messagingbr/frameworkbr/server/group/msgs.rss --- a/msgbranched/messagingbr/frameworkbr/server/group/msgs.rss Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ -/* -* Copyright (c) 1998-2003 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: msgs.rss* -*/ - - - -#include -#include - -// Flags - defined in TMsvEntry - -#define KMsvEntryLowPriority 0x0000 -#define KMsvEntryMediumPriority 0x0001 -#define KMsvEntryHighPriority 0x0002 - -//#define KMsvEntryStoreFlag 0x0004 // Not used -#define KMsvEntryNotCompleteFlag 0x0008 // the netry is marked as incomplete -#define KMsvEntryNewFlag 0x0010 -#define KMsvEntryUnreadFlag 0x0020 -#define KMsvEntryInvisibleFlag 0x0200 // will be invisible to the user -#define KMsvEntryMultipleRecipientFlag 0x0400 -//#define KMsvEntryFileFlag 0x0800 // Not used -#define KMsvEntryReadOnlyFlag 0x1000 // the entry or store cannot be altered -#define KMsvEntryStandardFolder 0x4000 // the entry will be place at beginning of a selection - - - -STRUCT SERVERENTRY - { - LONG id; - LONG parent; - LONG service=KMsvLocalServiceIndexEntryIdValue; - LONG type; - LONG mtm=KUidMsvLocalServiceMtmValue; - LONG flags=KMsvEntryMediumPriority; - LTEXT description=""; - LTEXT details=""; - } - -STRUCT SERVERSTARTUPINDEX - { - STRUCT entries[]; // must be SERVERENTRY's - } - -RESOURCE SERVERSTARTUPINDEX r_server_index_startup - { - entries= - { - SERVERENTRY { id=KMsvLocalServiceIndexEntryIdValue; - parent=KMsvRootIndexEntryIdValue; - type=KUidMsvServiceEntryValue; - flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details="Local"; }, - SERVERENTRY { id=KMsvGlobalInBoxIndexEntryIdValue; - parent=KMsvLocalServiceIndexEntryIdValue; - type=KUidMsvFolderEntryValue; - flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=qtn_mce_inbox; }, - SERVERENTRY { id=KMsvGlobalOutBoxIndexEntryIdValue; - parent=KMsvLocalServiceIndexEntryIdValue; - type=KUidMsvFolderEntryValue; - flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=qtn_mce_outbox; }, - SERVERENTRY { id=KMsvDraftEntryIdValue; - parent=KMsvLocalServiceIndexEntryIdValue; - type=KUidMsvFolderEntryValue; - flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=qtn_mce_drafts; }, - SERVERENTRY { id=KMsvSentEntryIdValue; - parent=KMsvLocalServiceIndexEntryIdValue; - type=KUidMsvFolderEntryValue; - flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=qtn_mce_sent_items; }, - SERVERENTRY { id=0x1008; - parent=KMsvLocalServiceIndexEntryIdValue; - type=KUidMsvFolderEntryValue; - flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=qtn_mce_documents; }, - SERVERENTRY { id=0x1009; - parent=0x1008; - type=KUidMsvFolderEntryValue; - flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder; - details=qtn_mce_doc_temp_folder; }, - SERVERENTRY { id=KMsvDeletedEntryFolderEntryIdValue; - parent=KMsvLocalServiceIndexEntryIdValue; - type=KUidMsvFolderEntryValue; - flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder|KMsvEntryInvisibleFlag; - details="Deleted"; } - }; - } - -// end of file diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/messagingbr/frameworkbr/server/loc/msgs.loc --- a/msgbranched/messagingbr/frameworkbr/server/loc/msgs.loc Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* -* Copyright (c) 2000 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: -* This file contains the localised strings for msgs -* -*/ - - - -// LOCALISATION STRINGS - -// d: Main view list item. -// d: Inbox -// l: list_single_large_graphic_pane_t1 -// -#define qtn_mce_inbox "Inbox" - -// d: Main view list item. -// d: Documents -// l: list_single_large_graphic_pane_t1 -// -#define qtn_mce_documents "Documents" - -// d: Main view list item. -// d: Drafts -// l: list_single_large_graphic_pane_t1 -// -#define qtn_mce_drafts "Drafts" - -// d: Main view list item. -// d: Sent items -// l: list_single_large_graphic_pane_t1 -// -#define qtn_mce_sent_items "Sent items" - -// d: Main view list item. -// d: Outbox -// l: list_single_large_graphic_pane_t1 -// -#define qtn_mce_outbox "Outbox" - -// d: Documents view list item. First item of the list when Documents folder is opened. -// l: list_double_graphic_pane_t1 -// -#define qtn_mce_doc_temp_folder "Templates" - - -// End of File - - diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/nbprotocols/smsstack/smsu/group/smsu.rss --- a/msgbranched/nbprotocols/smsstack/smsu/group/smsu.rss Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -/* -* Copyright (c) 2002 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: -* Smsu resource file. -* -*/ - - - -////////////////////////////////////////////////////////////////////////// -// -// smsu.RSS -// -// Copyright (c) 2003 Symbian Ltd. All rights reserved. -// -////////////////////////////////////////////////////////////////////////// - -#include - -STRUCT MinDiskSpaceHolder { LONG value; } - -// Nokia : normal sms level linked to critical level in SystemWarningLevels.hrh, -// class 0 sms level agreed to be 20K. -RESOURCE MinDiskSpaceHolder r_lowlimit_diskspace_holder { value = 20480; } -RESOURCE MinDiskSpaceHolder r_highlimit_diskspace_holder { value = KDRIVECCRITICALTHRESHOLD; } diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/rom/gtemailmtm.hby --- a/msgbranched/rom/gtemailmtm.hby Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -#ifndef __GTEMAILMTM_HBY__ -#define __GTEMAILMTM_HBY__ - -// -// Moved to gtemailmtmResources.iby -// -//data=MULTI_LINGUIFY(RSC DATAZ_\resource\messaging\imcm resource\messaging\imcm) - -#endif diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/rom/gtemailmtmResources.iby --- a/msgbranched/rom/gtemailmtmResources.iby Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +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: gtemailmtmResources.iby* -*/ - -#ifndef __GTEMAILMTM_RESOURCES_IBY__ -#define __GTEMAILMTM_RESOURCES_IBY__ - -// Refer to gtemailmtm.hby -data=DATAZ_\resource\messaging\imcm.rsc resource\messaging\imcm.rsc - -#endif \ No newline at end of file diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/rom/messageserver.hby --- a/msgbranched/rom/messageserver.hby Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -#ifndef __MESSAGESERVER_HBY__ -#define __MESSAGESERVER_HBY__ - -// -// Moved to \s60\mce\rom\messageserver_rsc.iby -// -//data=MULTI_LINGUIFY(RSC DATAZ_\resource\messaging\MSGS resource\messaging\MSGS) - -#endif diff -r 1347d5cca6af -r f8ad95794a08 msgbranched/rom/messageserver_rsc.iby --- a/msgbranched/rom/messageserver_rsc.iby Thu Jun 17 11:58:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* -* Copyright (c) 2004 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: Defines Series60 localized files -* -*/ - - - -#ifndef __MESSAGESERVER_RSC_IBY__ -#define __MESSAGESERVER_RSC_IBY__ - -//Resource file(s) for Message server -data=DATAZ_\MTM_RESOURCE_DIR\msgs.rsc MTM_RESOURCE_DIR\msgs.rsc -#endif diff -r 1347d5cca6af -r f8ad95794a08 msgfw_plat/always_online_client_api/inc/AlwaysOnlineManagerClient.h --- a/msgfw_plat/always_online_client_api/inc/AlwaysOnlineManagerClient.h Thu Jun 17 11:58:38 2010 +0100 +++ b/msgfw_plat/always_online_client_api/inc/AlwaysOnlineManagerClient.h Thu Jul 22 16:38:12 2010 +0100 @@ -22,7 +22,7 @@ #include #include -#include +#include const TInt KDefaultMessageSlots = 4; diff -r 1347d5cca6af -r f8ad95794a08 msgfw_plat/always_online_plugin_api/inc/AlwaysOnlineEComInterface.h --- a/msgfw_plat/always_online_plugin_api/inc/AlwaysOnlineEComInterface.h Thu Jun 17 11:58:38 2010 +0100 +++ b/msgfw_plat/always_online_plugin_api/inc/AlwaysOnlineEComInterface.h Thu Jul 22 16:38:12 2010 +0100 @@ -22,7 +22,7 @@ #include #include -#include +#include class MAlwaysOnlineStatusQueryInterface; diff -r 1347d5cca6af -r f8ad95794a08 msgfw_plat/group/bld.inf diff -r 1347d5cca6af -r f8ad95794a08 msgfw_plat/msg_common_utils_api/inc/MsgVoIPExtension.h diff -r 1347d5cca6af -r f8ad95794a08 msgfw_pub/send_ui_api/inc/CMessageAddress.h diff -r 1347d5cca6af -r f8ad95794a08 msgfw_pub/send_ui_api/inc/CMessageData.h diff -r 1347d5cca6af -r f8ad95794a08 msgfw_pub/send_ui_api/inc/CSendingServiceInfo.h diff -r 1347d5cca6af -r f8ad95794a08 msgfw_pub/send_ui_api/tsrc/bc/inc/SendUIAPITest.h diff -r 1347d5cca6af -r f8ad95794a08 msgfw_pub/send_ui_api/tsrc/inc/SendUIAPITest.h