# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286139978 -10800 # Node ID b9107cb7d204a06f66dad03c6077a6f1e0a04ac4 # Parent ef2733361cdbe1834cdaf0d0582a08fe85dd91bd Revision: 201037 Kit: 201039 diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -39,4 +39,3 @@ LIBRARY apmime.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp --- a/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -61,5 +61,3 @@ LIBRARY efsrv.lib // Rfs, RFile DEBUGLIBRARY flogger.lib - -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp --- a/connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -50,4 +50,3 @@ DEBUGLIBRARY flogger.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp --- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -59,5 +59,3 @@ DEBUGLIBRARY flogger.lib - -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp --- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -50,4 +50,3 @@ DEBUGLIBRARY flogger.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp --- a/connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -57,4 +57,3 @@ LIBRARY esock.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -58,4 +58,3 @@ LIBRARY hwrmhapticspacketizer.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp --- a/connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -63,4 +63,3 @@ LIBRARY esock.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp --- a/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -77,5 +77,3 @@ DEBUGLIBRARY flogger.lib - -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp --- a/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -44,11 +44,14 @@ USERINCLUDE ../../../clients/syncclient/inc SOURCE scondataproviderinfo.cpp -USERINCLUDE ..\inc +USERINCLUDE ../inc // Default system include paths APP_LAYER_SYSTEMINCLUDE +// For temporary use only +SYSTEMINCLUDE /epoc32/include/syncml + DEBUGLIBRARY flogger.lib LIBRARY euser.lib LIBRARY efsrv.lib @@ -61,4 +64,3 @@ LIBRARY charconv.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/servers/syncserver/inc/sconasynchandler.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/sconasynchandler.h Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/servers/syncserver/inc/sconasynchandler.h Mon Oct 04 00:06:18 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 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" @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "cscontimeout.h" diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/servers/syncserver/inc/sconsyncrelationship.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/sconsyncrelationship.h Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/servers/syncserver/inc/sconsyncrelationship.h Mon Oct 04 00:06:18 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include class CDictionaryFileStore; diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp --- a/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -77,4 +77,3 @@ LIBRARY platformver.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp --- a/connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -74,4 +74,3 @@ DEBUGLIBRARY flogger.lib // For debug logging -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp --- a/connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -47,4 +47,3 @@ LIBRARY estor.lib // For RWriteStream -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp --- a/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -97,4 +97,3 @@ // End of file -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp --- a/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -56,4 +56,3 @@ DEBUGLIBRARY flogger.lib -SMPSAFE diff -r ef2733361cdb -r b9107cb7d204 omads/omadsextensions/adapters/mediads/group/mediads.mmp --- a/omads/omadsextensions/adapters/mediads/group/mediads.mmp Fri Sep 17 08:27:35 2010 +0300 +++ b/omads/omadsextensions/adapters/mediads/group/mediads.mmp Mon Oct 04 00:06:18 2010 +0300 @@ -42,6 +42,8 @@ APP_LAYER_SYSTEMINCLUDE +// For temporary use only +SYSTEMINCLUDE /epoc32/include/syncml START RESOURCE mediadsprovider.rss HEADER diff -r ef2733361cdb -r b9107cb7d204 omads/omadsextensions/adapters/mediads/inc/snapshotitem.h --- a/omads/omadsextensions/adapters/mediads/inc/snapshotitem.h Fri Sep 17 08:27:35 2010 +0300 +++ b/omads/omadsextensions/adapters/mediads/inc/snapshotitem.h Mon Oct 04 00:06:18 2010 +0300 @@ -20,7 +20,7 @@ #define __SNAPSHOTITEM_H__ // INCLUDES -#include +#include #include #include "mediadsproviderdefs.h" #include "songitem.h" diff -r ef2733361cdb -r b9107cb7d204 omads/rom/omads.iby --- a/omads/rom/omads.iby Fri Sep 17 08:27:35 2010 +0300 +++ b/omads/rom/omads.iby Mon Oct 04 00:06:18 2010 +0300 @@ -36,9 +36,9 @@ #endif #ifdef __SYNCML_DS_CON // SyncML data synchronization contacts plug-in -ECOM_PLUGIN(nsmlcontactsdataprovider.dll,nsmlcontactsdataprovider.rsc) -data=DATAZ_\RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_1_2.rsc RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_1_2.rsc -data=DATAZ_\RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_2.rsc RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_2.rsc +REM ECOM_PLUGIN(nsmlcontactsdataprovider.dll,nsmlcontactsdataprovider.rsc) +REM data=DATAZ_\RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_1_2.rsc RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_1_2.rsc +REM data=DATAZ_\RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_2.rsc RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_2.rsc #endif // __SYNCML_DS_CON REM \ds\datamod