--- a/applicationmanagement/omascomoadapter/src/omascomoadapter.cpp Fri Mar 12 15:41:35 2010 +0200
+++ b/applicationmanagement/omascomoadapter/src/omascomoadapter.cpp Mon Mar 15 12:39:36 2010 +0200
@@ -48,7 +48,7 @@
#include <e32property.h>
#include <centralrepository.h>
#include <DevManInternalCRKeys.h>
-#include<HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
#include "NSmlPrivateAPI.h"
--- a/applicationmanagement/server/inc/AMDeploymentComponent.h Fri Mar 12 15:41:35 2010 +0200
+++ b/applicationmanagement/server/inc/AMDeploymentComponent.h Mon Mar 15 12:39:36 2010 +0200
@@ -28,7 +28,7 @@
#include "aminstalloptions.h"
#include "amdeploymentcomponentdata.h"
#include "AMDownload.h"
-#include<HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
namespace NApplicationManagement
--- a/applicationmanagement/server/inc/ApplicationManagementServer.h Fri Mar 12 15:41:35 2010 +0200
+++ b/applicationmanagement/server/inc/ApplicationManagementServer.h Mon Mar 15 12:39:36 2010 +0200
@@ -28,7 +28,7 @@
#include <swi/sisregistrysession.h>
#include <swi/sisregistrypackage.h>
#include <swi/sisregistryentry.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
#include "ApplicationManagementClientServer.h"
#include "PlatformSecurityPolicies.h"
--- a/applicationmanagement/server/src/AMDownloader.cpp Fri Mar 12 15:41:35 2010 +0200
+++ b/applicationmanagement/server/src/AMDownloader.cpp Mon Mar 15 12:39:36 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
//#include <BrowserUiInternalCRKeys.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
#include "AMDownloader.h"
//#include "aminstalloptions.h"
--- a/customization/EmbeddedLinkAdapter/inc/EmbeddedLinkApp.h Fri Mar 12 15:41:35 2010 +0200
+++ b/customization/EmbeddedLinkAdapter/inc/EmbeddedLinkApp.h Mon Mar 15 12:39:36 2010 +0200
@@ -18,8 +18,8 @@
#define EMBEDDEDLINKAPP_H
#include "EmbeddedLinkHandler.h"
#include <f32file.h>
-#include <FavouritesItem.h>
-#include <FavouritesItemList.h>
+#include <favouritesitem.h>
+#include <favouritesitemlist.h>
class CEmbeddedLinkApp : public CBase
{
--- a/customization/EmbeddedLinkAdapter/inc/EmbeddedLinkHandler.h Fri Mar 12 15:41:35 2010 +0200
+++ b/customization/EmbeddedLinkAdapter/inc/EmbeddedLinkHandler.h Mon Mar 15 12:39:36 2010 +0200
@@ -22,7 +22,7 @@
#include <favouriteslimits.h>
#include <e32std.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
class CEmbeddedLinkApp;
--- a/omadm/omadmextensions/adapters/browseradapter/src/nsmlbrowseradapter.cpp Fri Mar 12 15:41:35 2010 +0200
+++ b/omadm/omadmextensions/adapters/browseradapter/src/nsmlbrowseradapter.cpp Mon Mar 15 12:39:36 2010 +0200
@@ -31,7 +31,7 @@
#include "nsmldmiapmatcher.h"
#include <centralrepository.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
#include <commdb.h>
#include <cdbcols.h> // CommsDB columname defs
#include <ApUtils.h>
--- a/omadm/omadmextensions/adapters/nsmldinternet/inc/NSmlInternetAdapter.h Fri Mar 12 15:41:35 2010 +0200
+++ b/omadm/omadmextensions/adapters/nsmldinternet/inc/NSmlInternetAdapter.h Mon Mar 15 12:39:36 2010 +0200
@@ -567,6 +567,7 @@
RArray<TPtrC> iLockTableList;
TBool iWlanSupported;
+ TBool isAdd;
};
--- a/omadm/omadmextensions/adapters/nsmldinternet/src/NSmlInternetAdapter.cpp Fri Mar 12 15:41:35 2010 +0200
+++ b/omadm/omadmextensions/adapters/nsmldinternet/src/NSmlInternetAdapter.cpp Mon Mar 15 12:39:36 2010 +0200
@@ -189,7 +189,8 @@
iNetworkId = KErrNotFound;
iLingerValue = NULL;
- iLingerFlag = ETrue;
+ iLingerFlag = ETrue;
+ isAdd = EFalse;
}
//------------------------------------------------------------------------------
@@ -303,7 +304,7 @@
//
MSmlDmDDFObject& nNameDDF = nNAPDefDDF.AddChildObjectL(KNSmlDdfNAPName); // Name
FillNodeInfoL( nNameDDF,
- aclTypesAddGet,
+ aclTypesNoDelete,
MSmlDmDDFObject::EZeroOrOne,
MSmlDmDDFObject::EDynamic,
MSmlDmDDFObject::EChr,
@@ -830,6 +831,8 @@
_DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL(): begin");
DBG_ARGS8(_S8("AP:add aURI AddLeafObjectL - %S - %S"), &aURI, &aParentLUID);
DBG_ARGS8(_S8("AP:Object %S"), &aObject);
+
+ isAdd = ETrue;
TInt parentLUID(0);
if(aParentLUID.Length()<=0 )
@@ -3487,16 +3490,20 @@
// name
if ( aURI.Find( KNSmlDdfNAPName ) >= 0 )
{
- CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
+ TUint32 iapID10 = IntLUID(aLUID);
+ /* CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(serviceType,
qDB,
- serviceId);
+ serviceId);*/
+ CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP),
+ TPtrC(COMMDB_ID),
+ iapID);
errorCode = tableView->GotoFirstRecord();
if ( errorCode == KErrNone )
{
TBuf<KCommsDbSvrMaxFieldLength> columnValue;
- TRAPD(leavecode,tableView->ReadTextL(qColumn, columnValue));
+ TRAPD(leavecode,tableView->ReadTextL(TPtrC(COMMDB_NAME ), columnValue));
if(leavecode != 0)
{
CleanupStack::PopAndDestroy(); // tableView
@@ -3508,6 +3515,8 @@
pushed++;
}
CleanupStack::PopAndDestroy(); // tableView
+ CleanupStack::PopAndDestroy(pushed);
+ return CSmlDmAdapter::EOk;
}
// BearerL + NoPxForL + IAPService
else if (aURI.Find(KNSmlDdfIAPService) >= 0)
@@ -4835,10 +4844,19 @@
{
// Not correct name
// Remove all mappings from AP/xxx level
- TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid,
- GetDynamicAPNodeUri( aURI ) , ETrue );
- iPrevURI->Des().Format( KNullDesC8 );
- iPrevLUID = 0;
+ if(isAdd)
+ {
+ TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid,
+ GetDynamicAPNodeUri( aURI ) , ETrue );
+ iPrevURI->Des().Format( KNullDesC8 );
+ iPrevLUID = 0;
+ }
+ else
+ {
+ iIAPExists = ETrue;
+ iLeafType = EDMUpdate;
+ }
+
}
else
{
--- a/omadm/omadmextensions/adapters/syncmldm12/src/NSmlDmSettingsAdapter12.cpp Fri Mar 12 15:41:35 2010 +0200
+++ b/omadm/omadmextensions/adapters/syncmldm12/src/NSmlDmSettingsAdapter12.cpp Mon Mar 15 12:39:36 2010 +0200
@@ -3900,6 +3900,15 @@
TInt CNSmlDMSettingsAdapter12::ConstructTreeL(const TDesC8& aURI)
{
TInt profileID = KErrNotFound;
+ _LIT8( KNSmlDMIdZero, "DMAcc/DMId000" );
+ TBuf8<20> zeroURI; // DMAcc/DMIdnnn , nnn = profileid
+ zeroURI.Append( KNSmlDMIdZero );
+ HBufC8* ismapInfo = iCallBack->GetLuidAllocL(zeroURI);
+ if (ismapInfo->Length() != 0) // Tree is already constructrd, no need to proceed.
+ {
+ delete ismapInfo;
+ return profileID;
+ }
if( iSyncSessionOpen == EFalse )
{
iSyncSession.OpenL();
--- a/pnpmobileservices/pnpms/OnlineSupport/src/CCMAppUi.cpp Fri Mar 12 15:41:35 2010 +0200
+++ b/pnpmobileservices/pnpms/OnlineSupport/src/CCMAppUi.cpp Mon Mar 15 12:39:36 2010 +0200
@@ -31,10 +31,10 @@
#include <httpfiltercommonstringsext.h>
#include <OnlineSupport.rsg> // has to be system include.
#include <centralrepository.h> // link against centralrepository.lib
-#include <BrowserUiSDKCRKeys.h> // for KCRUidBrowser
+#include <browseruisdkcrkeys.h> // for KCRUidBrowser
#include <CoreApplicationUIsSDKCRKeys.h>// for KCRUidCoreApplicationUIs
//#include <BrowserUiInternalCRKeys.h> // BrowserUiSDKCRKeys.h file can replace this header file
-#include <WebUtilsInternalCRKeys.h> // for the profile strings
+#include <webutilsinternalcrkeys.h> // for the profile strings
#include "OnlineSupportLogger.h"
#include "CCMAppUi.h"
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningSaver.h Fri Mar 12 15:41:35 2010 +0200
+++ b/pnpmobileservices/pnpms/PnP/PnpProvisioningAppInc/PnpProvisioningSaver.h Mon Mar 15 12:39:36 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <msgbiocontrol.h> // for CMsgBioControl
#include <ActiveApDb.h>
-#include <FavouritesDbObserver.h>
+#include <favouritesdbobserver.h>
#include "mwaitdialogstatusnotifier.h" // for MWaitDialogStatusNotifier
// FORWARD DECLARATIONS
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningSaver.cpp Fri Mar 12 15:41:35 2010 +0200
+++ b/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningSaver.cpp Mon Mar 15 12:39:36 2010 +0200
@@ -25,7 +25,7 @@
#include <commdb.h>
#include <CWPEngine.h>
#include <CWPAdapter.h>
-#include <ActiveFavouritesDbNotifier.h>
+#include <activefavouritesdbnotifier.h>
#include "PnpProvisioningSaver.h"
#include "PnpLogger.h"