--- a/messagingfw/alwaysonline/group/bld.inf Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/alwaysonline/group/bld.inf Wed Jun 23 18:45:03 2010 +0300
@@ -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
--- a/messagingfw/alwaysonline/rom/AlwaysOnline.iby Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/alwaysonline/rom/AlwaysOnline.iby Wed Jun 23 18:45:03 2010 +0300
@@ -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
--- a/messagingfw/biomsgfw/BDB/BLD.INF Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/biomsgfw/BDB/BLD.INF Wed Jun 23 18:45:03 2010 +0300
@@ -30,4 +30,4 @@
../BDBTSRC/T_BdbHF.MMP manual
../BDBTSRC/t_bio_observer.mmp
-#include "../BDBTSRC/testbif/BLD.INF"
+#include "../BDBTSRC/testbif/bld.inf"
--- a/messagingfw/biomsgfw/group/BLD.INF Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/biomsgfw/group/BLD.INF Wed Jun 23 18:45:03 2010 +0300
@@ -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)
--- a/messagingfw/msgcommonutils/rom/msgcommonutils.iby Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgcommonutils/rom/msgcommonutils.iby Wed Jun 23 18:45:03 2010 +0300
@@ -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__
--- a/messagingfw/msgsrvnstore/group/bld.inf Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgsrvnstore/group/bld.inf Wed Jun 23 18:45:03 2010 +0300
@@ -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)
--- a/messagingfw/msgsrvnstore/server/group/MSGS.mmp Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgsrvnstore/server/group/MSGS.mmp Wed Jun 23 18:45:03 2010 +0300
@@ -19,6 +19,7 @@
@file
*/
+#include <platform_paths.hrh>
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
--- a/messagingfw/msgsrvnstore/server/group/MSGS.rss Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgsrvnstore/server/group/MSGS.rss Wed Jun 23 18:45:03 2010 +0300
@@ -14,7 +14,8 @@
//
#include "msgs.rls"
-#include "../inc/MSVSTD.HRH"
+#include <msvstd.hrh>
+#include <msgs.loc>
// 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"; }
};
}
--- a/messagingfw/msgsrvnstore/server/group/MSGS_AutoShutdown.mmp Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgsrvnstore/server/group/MSGS_AutoShutdown.mmp Wed Jun 23 18:45:03 2010 +0300
@@ -19,6 +19,7 @@
/**
@file
*/
+#include <platform_paths.hrh>
@@ -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
--- a/messagingfw/msgsrvnstore/server/group/bld.inf Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgsrvnstore/server/group/bld.inf Wed Jun 23 18:45:03 2010 +0300
@@ -14,6 +14,7 @@
// bld.inf
//
+#include <platform_paths.hrh>
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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgsrvnstore/server/loc/msgs.loc Wed Jun 23 18:45:03 2010 +0300
@@ -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
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgsrvnstore/server/rom/messageserver.hby Wed Jun 23 18:45:03 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgsrvnstore/server/rom/messageserver_rsc.iby Wed Jun 23 18:45:03 2010 +0300
@@ -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
--- a/messagingfw/msgtest/group/bld.inf Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgtest/group/bld.inf Wed Jun 23 18:45:03 2010 +0300
@@ -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"
--- a/messagingfw/msgtest/tools/group/bld.inf Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgtest/tools/group/bld.inf Wed Jun 23 18:45:03 2010 +0300
@@ -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"
--- a/messagingfw/msgtests/group/bld.inf Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/msgtests/group/bld.inf Wed Jun 23 18:45:03 2010 +0300
@@ -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"
--- a/messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvSchedulePackage.h Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/scheduledsendmtm/schedulesendmtm/inc/MsvSchedulePackage.h Wed Jun 23 18:45:03 2010 +0300
@@ -16,6 +16,9 @@
#ifndef MSV_SCHEDULE_PACKAGE_H_
#define MSV_SCHEDULE_PACKAGE_H_
+#include <s32std.h>
+#include <msvstd.h>
+
//
//
// TMsvSchedulePackage Declaration
--- a/messagingfw/watcherfw/group/watcher.mmp Fri Jun 04 10:32:16 2010 +0100
+++ b/messagingfw/watcherfw/group/watcher.mmp Wed Jun 23 18:45:03 2010 +0300
@@ -50,7 +50,7 @@
LIBRARY flogger.lib
#endif
-DEFFILE V2_WATCHER.DEF
+DEFFILE V2_watcher.DEF
VENDORID 0x70000001
--- a/msgfw_plat/always_online_client_api/inc/AlwaysOnlineManagerClient.h Fri Jun 04 10:32:16 2010 +0100
+++ b/msgfw_plat/always_online_client_api/inc/AlwaysOnlineManagerClient.h Wed Jun 23 18:45:03 2010 +0300
@@ -22,7 +22,7 @@
#include <e32base.h>
#include <msvapi.h>
-#include <alwaysonlinemanagercommon.h>
+#include <AlwaysOnlineManagerCommon.h>
const TInt KDefaultMessageSlots = 4;
--- a/msgfw_plat/always_online_plugin_api/inc/AlwaysOnlineEComInterface.h Fri Jun 04 10:32:16 2010 +0100
+++ b/msgfw_plat/always_online_plugin_api/inc/AlwaysOnlineEComInterface.h Wed Jun 23 18:45:03 2010 +0300
@@ -22,7 +22,7 @@
#include <e32base.h>
#include <msvapi.h>
-#include <Ecom/ECom.h>
+#include <ecom/ecom.h>
class MAlwaysOnlineStatusQueryInterface;