# HG changeset patch # User hgs # Date 1281115640 -19800 # Node ID 38e18a8b16c72cdfb4af9627d85ed60b1cbf7f29 # Parent 8f5e655bff70187bcb7abdd741d3555664011bb7 201031 diff -r 8f5e655bff70 -r 38e18a8b16c7 connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp --- a/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp Fri Jul 23 22:01:55 2010 +0530 +++ b/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp Fri Aug 06 22:57:20 2010 +0530 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-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" @@ -75,7 +75,7 @@ LIBRARY efsrv.lib LIBRARY sysutil.lib LIBRARY commonengine.lib // For resource reader -LIBRARY widgetregistryclient.lib +// LIBRARY widgetregistryclient.lib LIBRARY metadatautility.lib LIBRARY exiflib.lib LIBRARY charconv.lib diff -r 8f5e655bff70 -r 38e18a8b16c7 connectivitymodules/SeCon/services/pcd/src/sconpcdutility.cpp --- a/connectivitymodules/SeCon/services/pcd/src/sconpcdutility.cpp Fri Jul 23 22:01:55 2010 +0530 +++ b/connectivitymodules/SeCon/services/pcd/src/sconpcdutility.cpp Fri Aug 06 22:57:20 2010 +0530 @@ -21,7 +21,7 @@ #include #include #include -#include +// #include #include #include #include @@ -308,6 +308,9 @@ // void SConPcdUtility::AppendInstalledWidgetsL( CSConListInstApps& aListInstApps ) { + // Commented out as WidgetRegistry will be removed from MCL. + // TODO: Check how Widgets should be listed on future. + /* TRACE_FUNC_ENTRY; RWidgetRegistryClientSession widgetSession; CleanupClosePushL( widgetSession ); @@ -373,6 +376,7 @@ CleanupStack::PopAndDestroy( &widgetInfoArr ); CleanupStack::PopAndDestroy( &widgetSession ); TRACE_FUNC_EXIT; + */ } // --------------------------------------------------------- diff -r 8f5e655bff70 -r 38e18a8b16c7 dsdcmoadapter/src/nsmldsctrldcmoadapter.cpp --- a/dsdcmoadapter/src/nsmldsctrldcmoadapter.cpp Fri Jul 23 22:01:55 2010 +0530 +++ b/dsdcmoadapter/src/nsmldsctrldcmoadapter.cpp Fri Aug 06 22:57:20 2010 +0530 @@ -17,7 +17,6 @@ //SYSTEM INCLUDES #include -#include #include #include #include diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp --- a/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp Fri Aug 06 22:57:20 2010 +0530 @@ -26,7 +26,7 @@ CAPABILITY CAP_ECOM_PLUGIN VENDORID VID_DEFAULT -#if defined(ARMCC) +#if defined(EABI) DEFFILE ./def/eabinsmlagendadataprovider #elif defined(WINSCW) DEFFILE ./def/bwinscwnsmlagendadataprovider diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp --- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Fri Aug 06 22:57:20 2010 +0530 @@ -1206,7 +1206,8 @@ CalCommon::EIncludeEvents| CalCommon::EIncludeAnnivs| CalCommon::EIncludeCompletedTodos| - CalCommon::EIncludeIncompletedTodos, + CalCommon::EIncludeIncompletedTodos| + CalCommon::EIncludeRptsNextInstanceOnly, timeRange); TInt i = 0; diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp --- a/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp Fri Aug 06 22:57:20 2010 +0530 @@ -27,7 +27,7 @@ UID 0x10009D8D 0x101F6DDD VENDORID VID_DEFAULT -#if defined(ARMCC) +#if defined(EABI) DEFFILE ./def/eabicontactsdataprovider #elif defined(WINSCW) DEFFILE ./def/bwinscwcontactsdataprovider diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss --- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss Fri Aug 06 22:57:20 2010 +0530 @@ -85,6 +85,18 @@ SML_DATA_PROPERTY { version=1; + display_name="Uid"; + name="UID"; + data_type=""; + enum_values={}; + flags=0; + max_size=256; + max_occur=0; + params={}; + }, + SML_DATA_PROPERTY + { + version=1; display_name="Name"; name="N"; data_type=""; @@ -187,14 +199,6 @@ SML_DATA_PROPERTY_PARAM { version=1; - display_name="Default number"; - name="PREF"; - data_type=""; - enum_values={}; - }, - SML_DATA_PROPERTY_PARAM - { - version=1; display_name="Car telephone"; name="CAR"; data_type=""; @@ -229,14 +233,6 @@ SML_DATA_PROPERTY_PARAM { version=1; - display_name=""; - name="INTERNET"; - data_type=""; - enum_values={}; - }, - SML_DATA_PROPERTY_PARAM - { - version=1; display_name="Home email"; name="HOME"; data_type=""; @@ -255,6 +251,36 @@ SML_DATA_PROPERTY { version=1; + display_name="GEO Address"; + name="GEO"; + data_type=""; + enum_values={}; + flags= 0; + max_size=256; + max_occur=0; + params= + { + SML_DATA_PROPERTY_PARAM + { + version=1; + display_name="Home GEO"; + name="HOME"; + data_type=""; + enum_values={}; + }, + SML_DATA_PROPERTY_PARAM + { + version=1; + display_name="Work GEO"; + name="WORK"; + data_type=""; + enum_values={}; + } + }; + }, + SML_DATA_PROPERTY + { + version=1; display_name="URL address"; name="URL"; data_type=""; @@ -357,19 +383,6 @@ SML_DATA_PROPERTY { version=1; - display_name="Wireless Village Id"; - name="X-WV-ID"; - data_type=""; - enum_values={}; - flags= 0; - max_size=256; - max_occur=0; - params={}; - }, - - SML_DATA_PROPERTY - { - version=1; display_name="Assistant name"; name="X-ASSISTANT"; data_type=""; @@ -434,7 +447,7 @@ { version=1; display_name="Nickname"; - name="X-EPOCSECONDNAME"; + name="X-NICKNAME"; data_type=""; enum_values={}; flags= 0; @@ -445,18 +458,6 @@ SML_DATA_PROPERTY { version=1; - display_name="Class"; - name="X-CLASS"; - data_type=""; - enum_values={"PUBLIC","PRIVATE","CONFIDENTIAL"}; - flags= 0; - max_size=256; - max_occur=0; - params={}; - }, - SML_DATA_PROPERTY - { - version=1; display_name="SIP protocol"; name="X-SIP"; data_type=""; @@ -469,14 +470,6 @@ SML_DATA_PROPERTY_PARAM { version=1; - display_name="POC"; - name="POC"; - data_type=""; - enum_values={}; - }, - SML_DATA_PROPERTY_PARAM - { - version=1; display_name="SWIS"; name="SWIS"; data_type=""; diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss --- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss Fri Aug 06 22:57:20 2010 +0530 @@ -85,6 +85,18 @@ SML_DATA_PROPERTY { version=1; + display_name="Uid"; + name="UID"; + data_type=""; + enum_values={}; + flags=0; + max_size=256; + max_occur=0; + params={}; + }, + SML_DATA_PROPERTY + { + version=1; display_name="Name"; name="N"; data_type=""; @@ -134,7 +146,7 @@ display_name="Type"; name="TYPE"; data_type=""; - enum_values={"HOME", "WORK", "CELL", "PAGER", "FAX", "VIDEO", "PREF", "CAR"}; + enum_values={"HOME", "WORK", "CELL", "PAGER", "FAX", "VIDEO", "CAR"}; } }; }, @@ -168,7 +180,29 @@ display_name="Type"; name="TYPE"; data_type=""; - enum_values={"INTERNET", "HOME", "WORK"}; + enum_values={"HOME", "WORK"}; + } + }; + }, + SML_DATA_PROPERTY + { + version=1; + display_name="GEO Address"; + name="GEO"; + data_type=""; + enum_values={}; + flags= 0; + max_size=256; + max_occur=0; + params= + { + SML_DATA_PROPERTY_PARAM + { + version=1; + display_name="Type"; + name="TYPE"; + data_type=""; + enum_values={"HOME", "WORK"}; } }; }, @@ -269,18 +303,6 @@ SML_DATA_PROPERTY { version=1; - display_name="Wireless Village Id"; - name="X-WV-ID"; - data_type=""; - enum_values={}; - flags= 0; - max_size=256; - max_occur=0; - params={}; - }, - SML_DATA_PROPERTY - { - version=1; display_name="Assistant name"; name="X-ASSISTANT"; data_type=""; @@ -342,7 +364,7 @@ { version=1; display_name="Nickname"; - name="X-EPOCSECONDNAME"; + name="X-NICKNAME"; data_type=""; enum_values={}; flags= 0; @@ -353,18 +375,6 @@ SML_DATA_PROPERTY { version=1; - display_name="Class"; - name="X-CLASS"; - data_type=""; - enum_values={"PUBLIC","PRIVATE","CONFIDENTIAL"}; - flags= 0; - max_size=256; - max_occur=0; - params={}; - }, - SML_DATA_PROPERTY - { - version=1; display_name="SIP protocol"; name="X-SIP"; data_type=""; @@ -380,7 +390,7 @@ display_name="Type"; name="TYPE"; data_type=""; - enum_values={"POC", "SWIS", "VOIP"}; + enum_values={"SWIS", "VOIP"}; } }; } diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp --- a/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp Fri Aug 06 22:57:20 2010 +0530 @@ -27,7 +27,7 @@ UID 0x10009D8D 0x101F8612 VENDORID VID_DEFAULT -#if defined(ARMCC) +#if defined(EABI) DEFFILE ./def/eabinotepaddataprovider #elif defined(WINSCW) DEFFILE ./def/bwinscwnotepaddataprovider diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/datamod/bld/nsmldatamod.mmp --- a/omads/omadsextensions/datamod/bld/nsmldatamod.mmp Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/datamod/bld/nsmldatamod.mmp Fri Aug 06 22:57:20 2010 +0530 @@ -9,7 +9,7 @@ * Initial Contributors: * Nokia Corporation - initial contribution. * -* Contributors: +* Contributors: * * Description: mmp file for DS Data Modification * @@ -25,7 +25,7 @@ CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT -#if defined(ARMCC) +#if defined(EABI) DEFFILE ./def/eabidatamod #elif defined(WINSCW) DEFFILE ./def/bwinscwdatamod diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp --- a/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp Fri Aug 06 22:57:20 2010 +0530 @@ -26,7 +26,7 @@ VENDORID VID_DEFAULT -#if defined(ARMCC) +#if defined(EABI) DEFFILE ./def/eabicgiscriptparser #elif defined(WINSCW) DEFFILE ./def/bwinscwcgiscriptparser diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro --- a/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro Fri Aug 06 22:57:20 2010 +0530 @@ -44,7 +44,7 @@ defBlock = \ - "$${LITERAL_HASH}if defined(ARMCC)" \ + "$${LITERAL_HASH}if defined(EABI)" \ "DEFFILE ./def/eabicontactsdatastoreextension" \ "$${LITERAL_HASH}elif defined(WINSCW)" \ "DEFFILE ./def/bwinscwcontactsdatastoreextension" \ diff -r 8f5e655bff70 -r 38e18a8b16c7 omads/omadsextensions/dsutils/contactsdatastoreextension/src/nsmlcontactsdatastoreextension_p.cpp --- a/omads/omadsextensions/dsutils/contactsdatastoreextension/src/nsmlcontactsdatastoreextension_p.cpp Fri Jul 23 22:01:55 2010 +0530 +++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/src/nsmlcontactsdatastoreextension_p.cpp Fri Aug 06 22:57:20 2010 +0530 @@ -105,6 +105,13 @@ { _DBG_FILE("CNsmlContactsDataStoreExtensionPrivate::~CNsmlContactsDataStoreExtensionPrivate: BEGIN"); + + if( mContactManager ) + { + delete mContactManager; + mContactManager = NULL; + } + if( mWriter ) { delete mWriter; @@ -155,8 +162,10 @@ QList documents = mExporter->documents(); mWriter->startWriting( documents ); bool status = mWriter->waitForFinished(); - DBG_ARGS(_S("CNsmlContactsDataStoreExtensionPrivate::ExportContactsL:status %d"), status); - contactbufbase.InsertL( contactbufbase.Size(), *XQConversions::qStringToS60Desc8( contactsbuf.data() ) ); + DBG_ARGS(_S("CNsmlContactsDataStoreExtensionPrivate::ExportContactsL:status %d"), status); + HBufC8* buf = XQConversions::qStringToS60Desc8( contactsbuf.data() ); + contactbufbase.InsertL( contactbufbase.Size(), *buf ); + delete buf; } else { @@ -341,7 +350,9 @@ QStringList availableManagers = QContactManager::availableManagers(); foreach (const QString manager, availableManagers) { - cntstores->AppendL( XQConversions::qStringToS60Desc( manager )->Des() ); + HBufC* buf = XQConversions::qStringToS60Desc( manager ); + cntstores->AppendL( buf->Des() ); + delete buf; } _DBG_FILE("CNsmlContactsDataStoreExtensionPrivate::ListStoresL: END"); @@ -354,12 +365,10 @@ TInt64 CNsmlContactsDataStoreExtensionPrivate::MachineIdL() { _DBG_FILE("CNsmlContactsDataStoreExtensionPrivate::MachineIdL: BEGIN"); - - DBG_ARGS(_S("CNsmlContactsDataStoreExtensionPrivate::manageruri: %S"), XQConversions::qStringToS60Desc( - mContactManager->managerUri() ) ); - - TInt64 machineid = DefaultHash::Des16( XQConversions::qStringToS60Desc( - mContactManager->managerUri() )->Des() ); + + HBufC* buf = XQConversions::qStringToS60Desc( mContactManager->managerUri() ); + TInt64 machineid = DefaultHash::Des16( buf->Des() ); + delete buf; DBG_ARGS(_S("CNsmlContactsDataStoreExtensionPrivate::MachineIdL: %ld"), machineid );