Mercurial Mercurial > oss > FCL > sf > app > contentcontrol / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: 201037
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Mon, 04 Oct 2010 00:06:18 +0300
changeset 63 b9107cb7d204
parent 60 ef2733361cdb
Revision: 201037 Kit: 201039
connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/servers/syncserver/inc/sconasynchandler.h file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/servers/syncserver/inc/sconsyncrelationship.h file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp file | annotate | diff | comparison | revisions
connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp file | annotate | diff | comparison | revisions
omads/omadsextensions/adapters/mediads/group/mediads.mmp file | annotate | diff | comparison | revisions
omads/omadsextensions/adapters/mediads/inc/snapshotitem.h file | annotate | diff | comparison | revisions
omads/rom/omads.iby file | annotate | diff | comparison | revisions 
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 <e32base.h>
 #include <f32file.h>
 
-#include <syncml/SmlDataSyncDefs.h>
+#include <SmlDataSyncDefs.h>
 #include <stringpool.h>
 
 #include "cscontimeout.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 <e32base.h>
 #include <f32file.h> 
 #include <s32file.h>
-#include <syncml/smldatasyncdefs.h>
+#include <smldatasyncdefs.h>
 #include <syncmldef.h>
 
 class CDictionaryFileStore;
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 <syncml/SmlDataSyncDefs.h>
+#include <SmlDataSyncDefs.h>
 #include <hash.h>
 #include "mediadsproviderdefs.h"
 #include "songitem.h"
--- 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
FCL/sf/app/contentcontrol