# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282113554 -10800 # Node ID 392bf116d9ede04296a0c04dda7d8a018bdc3250 # Parent 9ba7f05d28a588946919558cb16f7e7722712694 Revision: 201031 Kit: 201033 diff -r 9ba7f05d28a5 -r 392bf116d9ed connectivitymodules/SeCon/common/conmltask/inc/sconconmltask.h --- a/connectivitymodules/SeCon/common/conmltask/inc/sconconmltask.h Tue Jul 06 14:06:02 2010 +0300 +++ b/connectivitymodules/SeCon/common/conmltask/inc/sconconmltask.h Wed Aug 18 09:39:14 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2008 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" @@ -212,7 +212,7 @@ { public: CSConInstApp() {}; - ~CSConInstApp() {}; + ~CSConInstApp(); CSConInstApp* CopyL(); TFileName iName; @@ -222,6 +222,7 @@ TInt64 iSize; TSConAppType iType; TUid iUid; + HBufC* iWidgetBundleId; // Widget bundle identifier like "com.nokia.widget.HelloWorld" }; //============================================================ diff -r 9ba7f05d28a5 -r 392bf116d9ed connectivitymodules/SeCon/common/conmltask/src/sconconmltask.cpp --- a/connectivitymodules/SeCon/common/conmltask/src/sconconmltask.cpp Tue Jul 06 14:06:02 2010 +0300 +++ b/connectivitymodules/SeCon/common/conmltask/src/sconconmltask.cpp Wed Aug 18 09:39:14 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2008 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" @@ -156,6 +156,10 @@ return copy; } +CSConInstApp::~CSConInstApp() + { + delete iWidgetBundleId; + } // ----------------------------------------------------------------------------- // CSConInstApp::Copy() // @@ -172,6 +176,14 @@ copy->iSize = iSize; copy->iType = iType; copy->iUid = iUid; + if ( iWidgetBundleId ) + { + copy->iWidgetBundleId = iWidgetBundleId->AllocL(); + } + else + { + copy->iWidgetBundleId = NULL; + } return copy; } diff -r 9ba7f05d28a5 -r 392bf116d9ed connectivitymodules/SeCon/group/stubs/secon_stub.pkg --- a/connectivitymodules/SeCon/group/stubs/secon_stub.pkg Tue Jul 06 14:06:02 2010 +0300 +++ b/connectivitymodules/SeCon/group/stubs/secon_stub.pkg Wed Aug 18 09:39:14 2010 +0300 @@ -17,7 +17,7 @@ &EN ; Header -#{"Service Controllers"},(0x101F99F6),1,72,0, TYPE=SA +#{"Service Controllers"},(0x101F99F6),1,73,0, TYPE=SA ; Localised Vendor name %{"Nokia"} diff -r 9ba7f05d28a5 -r 392bf116d9ed connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp --- a/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Tue Jul 06 14:06:02 2010 +0300 +++ b/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Wed Aug 18 09:39:14 2010 +0300 @@ -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" @@ -28,7 +28,7 @@ TARGETTYPE exe EPOCSTACKSIZE 0x10000 -EPOCHEAPSIZE 0x10000 0x800000 +EPOCHEAPSIZE 0x10000 0x1000000 // heap memory 16MB UID 0 0x101F99F6 diff -r 9ba7f05d28a5 -r 392bf116d9ed connectivitymodules/SeCon/servers/pcconn/src/sconpcconnserver.cpp --- a/connectivitymodules/SeCon/servers/pcconn/src/sconpcconnserver.cpp Tue Jul 06 14:06:02 2010 +0300 +++ b/connectivitymodules/SeCon/servers/pcconn/src/sconpcconnserver.cpp Wed Aug 18 09:39:14 2010 +0300 @@ -2310,9 +2310,9 @@ if ( aResult->iApps.Count() > 0 ) { - // 5 * KMaxFileName should be enought - // ( 4 items of TFileName and uid + type + size + 6* "#" ) - HBufC8* buf = HBufC8::NewLC( 5 * KMaxFileName ); + // 6 * KMaxFileName should be enought + // ( 5 items of TFileName and uid + type + size + 7* "#" ) + HBufC8* buf = HBufC8::NewLC( 6 * KMaxFileName ); TPtr8 ptrBuf = buf->Des(); aContent->applications = new ( ELeave ) ConML_Applications_t(); @@ -2330,7 +2330,7 @@ aResult->iApps[i]->iName)); CleanupStack::PopAndDestroy(); // BufToDesLC - // create uid: UID # Type # Size # Version # Vendor # Parent app. name # + // create uid: UID # Type # Size # Version # Vendor # Parent app. name # WidgetBundleId # LOGGER_WRITE( "CSConPCConnSession::AppendListInstalledAppsResultsL() : Create Uid" ); ptrBuf.Copy( UidToDesLC( aResult->iApps[i]->iUid ) ); @@ -2358,6 +2358,13 @@ CleanupStack::PopAndDestroy(); // BufToDesLC ptrBuf.Append( KSConAppInfoSeparator ); + if (aResult->iApps[i]->iWidgetBundleId) + { + ptrBuf.Append( BufToDesLC( *aResult->iApps[i]->iWidgetBundleId ) ); + CleanupStack::PopAndDestroy(); // BufToDesLC + } + + ptrBuf.Append( KSConAppInfoSeparator ); LOGGER_WRITE( "CSConPCConnSession::AppendListInstalledAppsResultsL() : set data" ); app->data->uid = new ( ELeave ) pcdata_t(); diff -r 9ba7f05d28a5 -r 392bf116d9ed connectivitymodules/SeCon/services/csc/bld/101F99F6.xml Binary file connectivitymodules/SeCon/services/csc/bld/101F99F6.xml has changed diff -r 9ba7f05d28a5 -r 392bf116d9ed connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp --- a/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp Tue Jul 06 14:06:02 2010 +0300 +++ b/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp Wed Aug 18 09:39:14 2010 +0300 @@ -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 9ba7f05d28a5 -r 392bf116d9ed connectivitymodules/SeCon/services/pcd/src/sconpcdutility.cpp --- a/connectivitymodules/SeCon/services/pcd/src/sconpcdutility.cpp Tue Jul 06 14:06:02 2010 +0300 +++ b/connectivitymodules/SeCon/services/pcd/src/sconpcdutility.cpp Wed Aug 18 09:39:14 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -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 ); @@ -317,7 +320,7 @@ RWidgetInfoArray widgetInfoArr; CleanupClosePushL( widgetInfoArr ); widgetSession.InstalledWidgetsL( widgetInfoArr ); - + TFileName bundleId; for ( TInt i = 0; i < widgetInfoArr.Count(); i++ ) { CWidgetInfo *item = widgetInfoArr[i]; @@ -359,6 +362,9 @@ } delete propValue; propValue = NULL; + bundleId.Zero(); + widgetSession.GetWidgetBundleId( item->iUid, bundleId ); + app->iWidgetBundleId = bundleId.AllocL(); User::LeaveIfError( aListInstApps.iApps.Append( app ) ); CleanupStack::Pop( app ); // ownership transferred, do not delete @@ -370,6 +376,7 @@ CleanupStack::PopAndDestroy( &widgetInfoArr ); CleanupStack::PopAndDestroy( &widgetSession ); TRACE_FUNC_EXIT; + */ } // --------------------------------------------------------- diff -r 9ba7f05d28a5 -r 392bf116d9ed dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp --- a/dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp Tue Jul 06 14:06:02 2010 +0300 +++ b/dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp Wed Aug 18 09:39:14 2010 +0300 @@ -35,6 +35,8 @@ SYSTEMINCLUDE /epoc32/include/ecom +SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets +SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore SOURCEPATH ../data start resource 20022FBC.rss @@ -45,4 +47,5 @@ LIBRARY euser.lib ECom.lib efsrv.lib LIBRARY centralrepository.lib -LIBRARY commonengine.lib \ No newline at end of file +LIBRARY commonengine.lib +LIBRARY hbcore.lib hbwidgets.lib \ No newline at end of file diff -r 9ba7f05d28a5 -r 392bf116d9ed dsdcmoadapter/src/nsmldsctrldcmoadapter.cpp --- a/dsdcmoadapter/src/nsmldsctrldcmoadapter.cpp Tue Jul 06 14:06:02 2010 +0300 +++ b/dsdcmoadapter/src/nsmldsctrldcmoadapter.cpp Wed Aug 18 09:39:14 2010 +0300 @@ -17,7 +17,6 @@ //SYSTEM INCLUDES #include -#include #include #include #include @@ -25,6 +24,7 @@ //USER INCLUDES #include "nsmldsctrldcmoadapter.h" +#include "hbtextresolversymbian.h" // CONSTANTS const TUid KCRUidDSDCMOConfig = { 0x20022FC0 }; @@ -33,9 +33,11 @@ // Name of the Plug-in adapter _LIT(KNsmlDesktopSyncTitle, "Desktop Sync"); // Description for Desktop Sync adapter -_LIT(KNsmlDSDCMODescription, "Used to enable/disable the Desktop Sync." ); //use Nsml????? -// Path used for fetching the string to be displayed -_LIT( KRuntimeResourceFileName, "z:dcmo.rsc" ); +_LIT(KNsmlDSDCMODescription, "Used to enable/disable the Desktop Sync." ); +// Filename in which title is present +_LIT( KdcmoResourceFileName, "deviceupdates_" ); +// Path to the translation file +_LIT( KdcmoResourceFilePath, "z:/resource/qt/translations/" ); // ============================ MEMBER FUNCTIONS =============================== @@ -215,14 +217,7 @@ // void CNsmlDsCtrlDCMOAdapter::GetLocalizedNameL (HBufC*& aLocName) { - TFileName myFileName; - TParse parseObj; - parseObj.Set( KRuntimeResourceFileName(), &KDC_RESOURCE_FILES_DIR,NULL ); - myFileName = parseObj.FullName(); - CStringResourceReader* readPluginName = CStringResourceReader::NewL( myFileName ); - CleanupStack::PushL(readPluginName); - TPtrC buf; - buf.Set(readPluginName->ReadResourceString(R_DM_RUN_TIME_VAR_DESKTOP_SYNC)); - aLocName = buf.AllocL() ; - CleanupStack::PopAndDestroy(readPluginName); + TBool result = HbTextResolverSymbian::Init(KdcmoResourceFileName, KdcmoResourceFilePath ); + _LIT(KTextDesktopSync, "txt_device_update_info_desktop_sync"); + aLocName = HbTextResolverSymbian::LoadL(KTextDesktopSync); } diff -r 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp --- a/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp Wed Aug 18 09:39:14 2010 +0300 @@ -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 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp --- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Wed Aug 18 09:39:14 2010 +0300 @@ -1206,7 +1206,8 @@ CalCommon::EIncludeEvents| CalCommon::EIncludeAnnivs| CalCommon::EIncludeCompletedTodos| - CalCommon::EIncludeIncompletedTodos, + CalCommon::EIncludeIncompletedTodos| + CalCommon::EIncludeRptsNextInstanceOnly, timeRange); TInt i = 0; diff -r 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp --- a/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp Wed Aug 18 09:39:14 2010 +0300 @@ -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 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss --- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss Wed Aug 18 09:39:14 2010 +0300 @@ -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 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss --- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss Wed Aug 18 09:39:14 2010 +0300 @@ -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 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp --- a/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp Wed Aug 18 09:39:14 2010 +0300 @@ -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 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/datamod/bld/nsmldatamod.mmp --- a/omads/omadsextensions/datamod/bld/nsmldatamod.mmp Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/datamod/bld/nsmldatamod.mmp Wed Aug 18 09:39:14 2010 +0300 @@ -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 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp --- a/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp Wed Aug 18 09:39:14 2010 +0300 @@ -26,7 +26,7 @@ VENDORID VID_DEFAULT -#if defined(ARMCC) +#if defined(EABI) DEFFILE ./def/eabicgiscriptparser #elif defined(WINSCW) DEFFILE ./def/bwinscwcgiscriptparser diff -r 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro --- a/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro Wed Aug 18 09:39:14 2010 +0300 @@ -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 9ba7f05d28a5 -r 392bf116d9ed omads/omadsextensions/dsutils/contactsdatastoreextension/src/nsmlcontactsdatastoreextension_p.cpp --- a/omads/omadsextensions/dsutils/contactsdatastoreextension/src/nsmlcontactsdatastoreextension_p.cpp Tue Jul 06 14:06:02 2010 +0300 +++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/src/nsmlcontactsdatastoreextension_p.cpp Wed Aug 18 09:39:14 2010 +0300 @@ -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 );