# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1263841249 -7200
# Node ID 5594fba90824949546d6c30f0e7d52e20dc2b8dd
# Parent  a9c0ce9139248504b35be8b17e9a809405217e78
Revision: 201001
Kit: 201003

diff -r a9c0ce913924 -r 5594fba90824 fotaapplication/fotaserver/FotaServer/inc/fotadownload.h
--- a/fotaapplication/fotaserver/FotaServer/inc/fotadownload.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/fotaapplication/fotaserver/FotaServer/inc/fotadownload.h	Mon Jan 18 21:00:49 2010 +0200
@@ -20,7 +20,7 @@
 #ifndef ___DOWNLOADER_H_
 #define ___DOWNLOADER_H_
 
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
 #include <etelpckt.h> //To read GSM Error codes from symbian
 #include <exterror.h> //To read GSM Error codes from symbian
 #include <wlanerrorcodes.h> //To read WLAN Error codes from s60
diff -r a9c0ce913924 -r 5594fba90824 fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -1560,12 +1560,15 @@
 
         return;
         }
-
-    naviPane->Pop();
-    if ( titlePane->Text() && originalTitle ) 
+		if(naviPane)
+    	naviPane->Pop();
+    if(	titlePane )
+    {	
+    	if ( titlePane->Text() && originalTitle ) 
         {
         TRAP_IGNORE( titlePane->SetTextL( *originalTitle ) );
         }
+    }
     CleanupStack::PopAndDestroy( originalTitle );
     task.SendToBackground();	
 
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/pnputil/inc/PnpUtilPrivateCRKeys.h
--- a/omaprovisioning/pnputil/inc/PnpUtilPrivateCRKeys.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/pnputil/inc/PnpUtilPrivateCRKeys.h	Mon Jan 18 21:00:49 2010 +0200
@@ -34,7 +34,7 @@
 const TUint32 KPnPUtilPublicExponent = 0x0000000A;
 const TUint32 KPnPProvUtilAppUID = 0x0000000B;
 const TUint32 KPnPProvUtilProvAdapID = 0x0000000C;
-
+const TUint32 KPnPUtilsEncryptionKey = 0x0000000D;
 
 
 #endif      // PNPUTILPRIVATECRKEYS_H
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/pnputil/src/PnpUtilImpl.cpp
--- a/omaprovisioning/pnputil/src/PnpUtilImpl.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/pnputil/src/PnpUtilImpl.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -35,8 +35,6 @@
 const TInt KMaxModulusLength = 300;
 const TInt KMaxPublicExponentLength = 10;
 
-_LIT8(K3DesKey, "111111111111111111111111");
-
 // Default token validity time
 const TInt KTokenValidityTime = 600;
 const TInt KTokenLength = 4;
@@ -44,6 +42,8 @@
 // (8 characters seems to be enough)
 const TInt KTokenLengthDuringStorage = 8;
 
+const TInt KEncryptionKeyLength = 24;
+
 // -----------------------------------------------------------------------------
 // CPnpUtilImpl::ConstructL
 // -----------------------------------------------------------------------------
@@ -64,9 +64,13 @@
 
     iRepository = CRepository::NewL( KCRUidPnpUtil );
 
+    TBuf8<KEncryptionKeyLength> encryptkey;
+    CreateEncryptionKeyL(encryptkey);
+    
+
 #ifndef __WINS__ // calling C3DESEncryptor::NewL crashes emulator
-    iEncryptor = C3DESEncryptor::NewL( K3DesKey );
-    iDecryptor = C3DESDecryptor::NewL( K3DesKey );
+    iEncryptor = C3DESEncryptor::NewL( encryptkey );
+    iDecryptor = C3DESDecryptor::NewL( encryptkey );
 #endif 
 
     LOGSTRING( "Exit from CPnpUtilImpl::ConstructL()" );
@@ -1063,4 +1067,51 @@
     LOGSTRING("RESERVED_FUNC")
     }
 
+// -----------------------------------------------------------------------------
+// CPnpUtilImpl::CreateEncryptionKeyL
+// -----------------------------------------------------------------------------
+//
+void CPnpUtilImpl::CreateEncryptionKeyL(TDes8& aEncryptionKey)
+   {
+   TBuf8<KEncryptionKeyLength> keystorage;
+   User::LeaveIfError( iRepository->Get( KPnPUtilsEncryptionKey, keystorage) );
+    
+   if(keystorage.Compare(KNullDesC8()))
+   {
+     LOGSTRING("CPnpUtilImpl::CreateEncryptionKey- Compare visited");
+     aEncryptionKey.Copy(keystorage);
+     LOGTEXT( aEncryptionKey);
+     return;
+   }
+
+
+   LOGSTRING("CPnpUtilImpl::CreateEncryptionKey");
+    if( aEncryptionKey.MaxLength() < KEncryptionKeyLength)
+        {
+        User::Leave( KErrArgument );
+        }
+
+    TBuf8<KEncryptionKeyLength> buffer;
+
+    TTime time;
+    time.HomeTime();
+    TInt64 seed = time.Int64();
+    for( TInt i(0); i < KEncryptionKeyLength ; i++ )
+        {
+        TChar character( RandomCharacter( seed ) );
+        buffer.Append( character );
+        }
+
+    LOGSTRING("New Encryption Key:");
+    LOGTEXT( buffer );
+    aEncryptionKey.Copy( buffer );
+
+ 
+    // Save the nonce
+    User::LeaveIfError( iRepository->Set( KPnPUtilsEncryptionKey, buffer ) );
+
+    LOGSTRING("CPnpUtilImpl::CreateEncryptionKey- done");
+
+   }
+
 //  End of File  
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/IMAdapter/Group/WPWVAdapterResource.rss
--- a/omaprovisioning/provisioning/IMAdapter/Group/WPWVAdapterResource.rss	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/IMAdapter/Group/WPWVAdapterResource.rss	Mon Jan 18 21:00:49 2010 +0200
@@ -18,8 +18,8 @@
 
 //  INCLUDES
 #include <badef.rh>
-#include <Provisioning.loc>
-#include <WPWVAdapter.loc>
+#include <provisioning.loc>
+#include <wpwvadapter.loc>
 
 // Default Name for WV Server
 
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/ProvisioningBC/Src/CWPSaver.cpp
--- a/omaprovisioning/provisioning/ProvisioningBC/Src/CWPSaver.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/ProvisioningBC/Src/CWPSaver.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -23,7 +23,7 @@
 #include <commdb.h>
 #include <CWPEngine.h>
 #include <CWPAdapter.h>
-#include <ActiveFavouritesDbNotifier.h>
+#include <activefavouritesdbnotifier.h>
 #include "CWPSaver.h"
 
 // CONSTANTS
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/ProvisioningParser/Src/CWPWbxmlParser.cpp
--- a/omaprovisioning/provisioning/ProvisioningParser/Src/CWPWbxmlParser.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/ProvisioningParser/Src/CWPWbxmlParser.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -22,7 +22,7 @@
 #include "CWPWbxmlParser.h"
 #include "OMAProvisioningDictionary.h"
 #include "ProvisioningDebug.h"
-#include <nw_cXML_Parser.h>
+#include <nw_cxml_parser.h>
 
 // EXTERNAL DATA STRUCTURES
 extern "C" NW_WBXML_Dictionary_t NW_omawapprovisioning_WBXMLDictionary;
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserAdapter.h
--- a/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserAdapter.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserAdapter.h	Mon Jan 18 21:00:49 2010 +0200
@@ -22,7 +22,7 @@
 // INCLUDES
 #include "CWPWAPAdapterBase.h"
 
-#include <FavouritesSession.h>
+#include <favouritessession.h>
 #include <FavouritesDb.h>
 
 
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserItem.h
--- a/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserItem.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserItem.h	Mon Jan 18 21:00:49 2010 +0200
@@ -22,7 +22,7 @@
 // INCLUDES
 #include <e32base.h>
 #include <MWPVisitor.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 #include "CWPWAPItemBAse.h"
 
 // FORWARD DECLARATIONS
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBookmarkItem.cpp
--- a/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBookmarkItem.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBookmarkItem.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -21,7 +21,7 @@
 #include <e32base.h>
 #include <CWPCharacteristic.h>
 #include <CWPParameter.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 #include <FavouritesItemList.h>         // CFavouritesItemList
 #include <wpwapadapterresource.rsg>
 #include <CWPAdapter.h>
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserAdapter.cpp
--- a/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserAdapter.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserAdapter.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include <e32base.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 #include <CWPAdapter.h>
 #include <CWPCharacteristic.h>
 #include <CWPParameter.h>
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserItem.cpp
--- a/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserItem.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserItem.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -26,7 +26,7 @@
 #include <CWPParameter.h>
 #include <CWPAdapter.h>
 #include <centralrepository.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include "CWPWAPBrowserItem.h"
 #include "WPWAPItemFactory.h"
 #include "ProvisioningDebug.h"
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPMMSItem.cpp
--- a/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPMMSItem.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPMMSItem.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -27,7 +27,7 @@
 #include <CWPCharacteristic.h>
 #include <CWPParameter.h>
 #include <CWPAdapter.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 #include "CWPWAPMMSItem.h"
 #include "WPWAPItemFactory.h"
 #include "WPWAPUtil.h"
diff -r a9c0ce913924 -r 5594fba90824 omaprovisioning/provisioning/accesspointadapter/Src/CWPAPNapdef.cpp
--- a/omaprovisioning/provisioning/accesspointadapter/Src/CWPAPNapdef.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/omaprovisioning/provisioning/accesspointadapter/Src/CWPAPNapdef.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -840,14 +840,21 @@
     else if( ( aParameter.Name().Compare( SSSID ) ) == 0 )
         {
         FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL iPriHSSID" ) );
-			  scssid->iSSSID = &aParameter;
+        if(scssid!=NULL)
+        	{
+        	scssid->iSSSID = &aParameter;
+        	}
+			  
 
         }// else if
 
     else if( ( aParameter.Name().Compare( SUSSID ) ) == 0 )
         {
         FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL iPriHSSID" ) );
-			  scssid->iSUSSID = &aParameter;
+			  if(scssid!=NULL)
+        	{
+        	scssid->iSUSSID = &aParameter;
+        	}
         }// else if
                         
     else if( ( aParameter.Name().Compare( NETMODE ) ) == 0 )
@@ -1010,6 +1017,10 @@
    	    {
    	    eap = iEapTypeArray[iEapTypeArray.Count()-1];
    	    }
+   	if(!eap)
+   	    {
+   	    return;
+   	    }    
    	
 	TPtrC value( aParameter.Value() );
 	
diff -r a9c0ce913924 -r 5594fba90824 remotemgmt_plat/device_management_plugin_api/inc/smldmadapter.h
--- a/remotemgmt_plat/device_management_plugin_api/inc/smldmadapter.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/remotemgmt_plat/device_management_plugin_api/inc/smldmadapter.h	Mon Jan 18 21:00:49 2010 +0200
@@ -602,6 +602,16 @@
 	@prototype
 	*/
 	virtual HBufC8* GetLuidAllocL( const TDesC8& aURI ) = 0;
+	
+	/**
+	The function is used to remove a mapped URI. Returns the error code about mapping removal.
+	@param aAdapterId	Settings Adapter id
+	@param aURI                 Mapped Uri
+	@param aChildAlso          Indicates the child nodes removal
+	@publishedPartner
+	@prototype
+	*/
+	virtual TInt RemoveMappingL( TUint32 aAdapterId, const TDesC8& aURI, TBool aChildAlso ) = 0;
 	};
 
 
diff -r a9c0ce913924 -r 5594fba90824 remotemgmt_plat/fota_engine_api/tsrc/group/fota_engine_api.mmp
--- a/remotemgmt_plat/fota_engine_api/tsrc/group/fota_engine_api.mmp	Thu Jan 07 13:15:03 2010 +0200
+++ b/remotemgmt_plat/fota_engine_api/tsrc/group/fota_engine_api.mmp	Mon Jan 18 21:00:49 2010 +0200
@@ -65,4 +65,6 @@
 // DEFFILE ?filename
 // AIF ?filename
 
+SMPSAFE
+
 // End of File
diff -r a9c0ce913924 -r 5594fba90824 remotemgmt_plat/pnpms_utils_api/inc/PnpUtilImpl.h
--- a/remotemgmt_plat/pnpms_utils_api/inc/PnpUtilImpl.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/remotemgmt_plat/pnpms_utils_api/inc/PnpUtilImpl.h	Mon Jan 18 21:00:49 2010 +0200
@@ -216,6 +216,8 @@
         * 
         */
         HBufC8* PackLC( const TDesC8& aHex ) const;
+        
+        void CreateEncryptionKeyL(TDes8& aEncryptionKey);
 
         CRepository* iRepository;
 
diff -r a9c0ce913924 -r 5594fba90824 remotemgmt_plat/scp_server_api/tsrc/group/scp_autolock_exe.mmp
--- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_autolock_exe.mmp	Thu Jan 07 13:15:03 2010 +0200
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_autolock_exe.mmp	Mon Jan 18 21:00:49 2010 +0200
@@ -49,4 +49,6 @@
 
 LIBRARY		scpclient.lib
 
+SMPSAFE
+
 //end of file
diff -r a9c0ce913924 -r 5594fba90824 remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp
--- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp	Thu Jan 07 13:15:03 2010 +0200
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp	Mon Jan 18 21:00:49 2010 +0200
@@ -56,5 +56,6 @@
 LIBRARY         edbms.lib 
 LIBRARY         charconv.lib
 
+SMPSAFE
 
 // End of File
diff -r a9c0ce913924 -r 5594fba90824 remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp
--- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp	Thu Jan 07 13:15:03 2010 +0200
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp	Mon Jan 18 21:00:49 2010 +0200
@@ -47,4 +47,5 @@
 
 LIBRARY		scpclient.lib
 
+SMPSAFE
 // end of file
\ No newline at end of file
diff -r a9c0ce913924 -r 5594fba90824 remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp
--- a/remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp	Thu Jan 07 13:15:03 2010 +0200
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp	Mon Jan 18 21:00:49 2010 +0200
@@ -90,4 +90,6 @@
 // DEFFILE ?filename
 // AIF ?filename
 
+SMPSAFE
+
 // End of File
diff -r a9c0ce913924 -r 5594fba90824 remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp
--- a/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp	Thu Jan 07 13:15:03 2010 +0200
+++ b/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp	Mon Jan 18 21:00:49 2010 +0200
@@ -86,4 +86,6 @@
 // DEFFILE ?filename
 // AIF ?filename
 
+SMPSAFE
+
 // End of File
diff -r a9c0ce913924 -r 5594fba90824 syncmlfw/dm/hostserver/dmhostserverbase/inc/nsmldmhostsession.h
--- a/syncmlfw/dm/hostserver/dmhostserverbase/inc/nsmldmhostsession.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/syncmlfw/dm/hostserver/dmhostserverbase/inc/nsmldmhostsession.h	Mon Jan 18 21:00:49 2010 +0200
@@ -153,6 +153,16 @@
 	* @return HBufC8*. If LUID is not found, the function allocates a null length string.
 	*/	
 	HBufC8* GetLuidAllocL ( const TDesC8& aURI );
+	
+	/**
+	* MSmlDmCallback - callback interface.
+ 	*  The function removes aURI of the corresponding adapter.  
+	*@param aAdapterId Adapter Id.
+	*@param aURI. URI of the object. 
+	*@param aChildAlso Indicates whether childs to be removed or not.
+	* @return TInt Error code.
+	*/	
+	TInt RemoveMappingL( TUint32 aAdapterId, const TDesC8& aURI, TBool aChildAlso );
 
 	/**
 	* C++ destructor.
diff -r a9c0ce913924 -r 5594fba90824 syncmlfw/dm/hostserver/dmhostserverbase/src/nsmldmhostsession.cpp
--- a/syncmlfw/dm/hostserver/dmhostserverbase/src/nsmldmhostsession.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/syncmlfw/dm/hostserver/dmhostserverbase/src/nsmldmhostsession.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -2286,6 +2286,31 @@
 	}
 
 // ------------------------------------------------------------------------------------------------
+// void CNSmlDMHostSession::RemoveMappingL()
+//	This function is called to remove an URI from tree database.  
+//	@return TInt. The Error code.
+// ------------------------------------------------------------------------------------------------
+//
+TInt CNSmlDMHostSession::RemoveMappingL( TUint32 aAdapterId, const TDesC8& aURI, TBool aChildAlso )
+    {
+    TInt ret = KErrNotFound;
+    if ( !iCbSessConnected )
+        {
+        ret = iCbSession.Connect();
+        if ( ret != KErrNone )
+            {
+            _DBG_FILE("ERROR!!! RemoveMappingL Connect to Callback server FAILED!!!!");                            
+            }
+        else 
+            {
+            iCbSessConnected = ETrue;           
+            }
+        }
+    ret = iCbSession.RemoveMappingInfoL( aAdapterId, aURI, aChildAlso );
+    return ret;
+    }
+	
+// ------------------------------------------------------------------------------------------------
 // Client code to access other dm host servers
 // ------------------------------------------------------------------------------------------------
 
diff -r a9c0ce913924 -r 5594fba90824 syncmlfw/dm/settings/inc/DMprofileContentHandler.h
--- a/syncmlfw/dm/settings/inc/DMprofileContentHandler.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/syncmlfw/dm/settings/inc/DMprofileContentHandler.h	Mon Jan 18 21:00:49 2010 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <f32file.h>
-#include "MXMLAttributes.h"
+#include "mxmlattributes.h"
 #include "MXMLContentHandler.h"
 #include "NSmlDMResourceProfile.h"
 
diff -r a9c0ce913924 -r 5594fba90824 syncmlfw/dm/treemodule/inc/nsmldmddf.h
--- a/syncmlfw/dm/treemodule/inc/nsmldmddf.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/syncmlfw/dm/treemodule/inc/nsmldmddf.h	Mon Jan 18 21:00:49 2010 +0200
@@ -409,6 +409,13 @@
 	*/
 	void DeleteandAddStatusRefsL( TInt aStatusRef,
 			MSmlDmAdapter::TError aErrorCode );
+	
+	/**
+	* Buffers the internal nodes added in a session	
+	* @param	aURI		Target URI in command
+	* @return 	None
+	*/
+	void UpdateAddNodeListL(const TDesC8& aURI);	
 			
 	/**
 	* Pointer to tree dtd
diff -r a9c0ce913924 -r 5594fba90824 syncmlfw/dm/treemodule/src/nsmldmddf.cpp
--- a/syncmlfw/dm/treemodule/src/nsmldmddf.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/syncmlfw/dm/treemodule/src/nsmldmddf.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -42,7 +42,6 @@
 const TInt KGranularity = 4;
 // FOTA
 _LIT8 ( KNSmlDMFotaNode, "FUMO" );
-_LIT8 ( KNSmlDMAcc, "DMAcc");
 _LIT8 ( KNSmlDMRoot, "." );
 // FOTA end
 
@@ -226,7 +225,7 @@
 			     {
 			     TBool returnstatus = ETrue; 
 			     TPtrC8 Uri1 = NSmlDmURI::URISeg(aURI,1);
-			     if( iAddRootNodesList && Uri1.Match(KNSmlDMAcc) >= KErrNone )//dm case
+			     if( iAddRootNodesList )//dm case
 			     {
 			     TPtrC8 FindUri = NSmlDmURI::URISeg(aURI,2);
 			     HBufC8* puri = HBufC8::NewLC(Uri1.Length()+FindUri.Length()+2);
@@ -291,23 +290,27 @@
 			          (err == KErrNone && (NodeAddingSuccess == EAdded ||
 			                  NodeAddingSuccess == ENotAdded) ) )
 			      {
-			      if(iAddRootNodesList) //already created
-			          {																						
-			          //Do check if there is any node already added					
-			          if( iAddRootNodesList->Match(aURI) <= KErrNotFound ) 
-			              {
-			              iAddRootNodesList = iAddRootNodesList->ReAllocL
-			              (iAddRootNodesList->Length() + aURI.Length()+ 10);
-			              iAddRootNodesList->Des().Append(aURI);
-			              }					
+			      UpdateAddNodeListL(aURI);
+			      }
+			  else if(err == KErrNone && NodeAddingSuccess != EFailed )
+			      {
+			      //Check luid, 
+			      HBufC8* newluid = iDbSession.GetLuidAllocL(iAdapterId,aURI);
+			               
+			      CleanupStack::PushL(newluid);
+			      if(newluid->Length() > 0 && newluid->Compare(*luid)==0 ) 
+			          {
+					  _DBG_FILE("Already existed dont buffer");
 			          }
-			      else //getting created
-			          {					
-			          iAddRootNodesList = HBufC8::NewL(aURI.Length()+ 10);					
-			          iAddRootNodesList->Des().Append(aURI);
-			          }			      
-			      iAddRootNodesList->Des().Append(',');				
-			      }			  			  
+			      else
+			          {
+			          UpdateAddNodeListL(aURI);
+			          }
+			      CleanupStack::PopAndDestroy(); //newluid
+			      }
+			  
+			 
+			  
 			  }
 			adapterCalled = ETrue;
 		
@@ -1818,4 +1821,27 @@
 			}
 		}
 	}
-
+	
+// ===========================================================================
+// CNSmlDmDDF::UpdateAddNodeListL
+// ===========================================================================
+void CNSmlDmDDF::UpdateAddNodeListL(const TDesC8& aURI)
+    {
+    if(iAddRootNodesList) //already created
+        {                                                                                     
+        //Do check if there is any node already added                 
+        if( iAddRootNodesList->Match(aURI) <= KErrNotFound ) 
+            {
+            iAddRootNodesList = iAddRootNodesList->ReAllocL
+            (iAddRootNodesList->Length() + aURI.Length()+ 10);
+            iAddRootNodesList->Des().Append(aURI);
+            }                 
+        }
+    else //getting created
+        {                 
+        iAddRootNodesList = HBufC8::NewL(aURI.Length()+ 10);                  
+        iAddRootNodesList->Des().Append(aURI);
+        }    
+    iAddRootNodesList->Des().Append(',');     
+    }
+	
diff -r a9c0ce913924 -r 5594fba90824 syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h
--- a/syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h	Mon Jan 18 21:00:49 2010 +0200
@@ -24,7 +24,7 @@
 #include <e32std.h>
 #include <f32file.h>
 #include <eikenv.h> //JIM is this needed ??
-#include "MXMLAttributes.h"
+#include "mxmlattributes.h"
 #include "MXMLContentHandler.h"
 
 #include "nsmldssettings.h"
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp
--- a/terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -234,7 +234,10 @@
     THandlerServiceId srvid;
     THandlerOperation opn;
 
-    service->GetServiceIdAndOperation(srvid,opn);
+		if( service )
+		{
+    	service->GetServiceIdAndOperation(srvid,opn);
+    }
 
     TBool mmcservice (EFalse);
     if (service == iServices[EMmcService])
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPClient/data/SCPNotifier.rss
--- a/terminalsecurity/SCP/SCPClient/data/SCPNotifier.rss	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/data/SCPNotifier.rss	Mon Jan 18 21:00:49 2010 +0200
@@ -104,9 +104,10 @@
     {
     buf = qtn_set_sec_code_setting_query;
     }
-/*RESOURCE TBUF r_set_sec_code_startup_query
+    
+RESOURCE TBUF r_set_sec_code_setting_query_server
     {
-    buf = qtn_set_sec_code_startup_query;
-    }*/
+    buf = qtn_set_sec_code_setting_query_server;
+    }
 // end of file
 
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPClient/inc/SCPLockObserver.h
--- a/terminalsecurity/SCP/SCPClient/inc/SCPLockObserver.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/inc/SCPLockObserver.h	Mon Jan 18 21:00:49 2010 +0200
@@ -19,7 +19,7 @@
 
 #include <e32svr.h>
 #include <e32property.h>
-#include "SecUi.hrh"
+#include "secui.hrh"
 
  
 class CSCPQueryDialog;
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPClient/inc/SCPQueryDialog.h
--- a/terminalsecurity/SCP/SCPClient/inc/SCPQueryDialog.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/inc/SCPQueryDialog.h	Mon Jan 18 21:00:49 2010 +0200
@@ -119,6 +119,7 @@
         TBuf<KSCPPasscodeMaxLength+1>   iTmpBuffer;
         TBool                           iPrioritySet;
         TBool                           iPriorityDropped;
+        TBool							isCallSoftkeyAdded;
         /** An integer variable to define the input mode of the lock code query */
         TInt def_mode;
         TInt iKeyUsed;
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPClient/loc/SCPNotifier.loc
--- a/terminalsecurity/SCP/SCPClient/loc/SCPNotifier.loc	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/loc/SCPNotifier.loc	Mon Jan 18 21:00:49 2010 +0200
@@ -38,8 +38,9 @@
 //r: 5.2
 #define qtn_set_sec_code_setting_query "Lock Code has not been set. Set now?"
 //d: The text for asking the user to enter the lock code during phone startup.
-//l: popup_info_list_pane_t2
+//l:  popup_info_list_pane_t2/opt1
 //r: 5.2
-//#define qtn_set_sec_code_startup_query "Lock Code is not set. Please set it now."
+#define qtn_set_sec_code_setting_query_server "Lock Code has not been set. Please set the Lock Code."
+
 // End of File
 
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPClient/src/SCPClient.cpp
--- a/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -1265,8 +1265,8 @@
         CAknGlobalConfirmationQuery* query = CAknGlobalConfirmationQuery :: NewLC();
 
         if(aButtonsShown == SCP_OK || aButtonsShown == SCP_OK_ETEL) {
-            //msgConfirmSave = CEikonEnv :: Static()->AllocReadResourceLC(R_SET_SEC_CODE_STARTUP_QUERY);
-            msgConfirmSave = CEikonEnv :: Static()->AllocReadResourceLC(R_SET_SEC_CODE);
+            //msgConfirmSave = CEikonEnv :: Static()->AllocReadResourceLC(R_SET_SEC_CODE);
+             msgConfirmSave = CEikonEnv :: Static()->AllocReadResourceLC(R_SET_SEC_CODE_SETTING_QUERY_SERVER);
             query->ShowConfirmationQueryL(statusSave, *msgConfirmSave, R_AVKON_SOFTKEYS_OK_EMPTY__OK, R_QGN_NOTE_INFO_ANIM);
         }
         else {
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp
--- a/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -19,7 +19,7 @@
 #include	<coreapplicationuisdomainpskeys.h>
 #include <ctsydomainpskeys.h>
 //#include    <SecurityUIsPrivatePSKeys.h>
-#include "SecUi.hrh"
+#include "secui.hrh"
 #include "SCPLockObserver.h"
 #include "SCPQueryDialog.h"
 #include "SCPDebug.h"
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp
--- a/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -74,7 +74,8 @@
 			  iPreviousCharacterWasInvalid( EFalse ),
 			  iPrioritySet( EFalse ),
 			  iPriorityDropped( EFalse ),
-			  iKeyUsed ( NULL )
+			  iKeyUsed ( NULL ),
+			  isCallSoftkeyAdded(EFalse)
 	{		 
 	}
 	
@@ -537,15 +538,21 @@
             if ( queryControl != NULL )
                 {
                 queryControl->RevealSecretText( ETrue );
+                if (isCallSoftkeyAdded == EFalse)
+                {
+                	isCallSoftkeyAdded = ETrue;
                 HBufC* cbaLabel = NULL;
 				Dprint( (_L("CSCPQueryDialog::OfferKeyEventL(): R_AVKON_SOFTKEY_CALL_TEXT") ));
                 TRAPD ( err, cbaLabel =
                         StringLoader::LoadL( R_AVKON_SOFTKEY_CALL_TEXT) );
                 if ( err == KErrNone )
                 {
+                	ButtonGroupContainer().RemoveCommandFromStack(0,EAknSoftkeyOk);
                 TRAP ( err, ButtonGroupContainer().AddCommandToStackL( 0, EAknSoftkeyEmergencyCall,
                         *cbaLabel) );
+				ButtonGroupContainer().DrawDeferred();
                 delete cbaLabel;
+                }
               }
                 }            
             }
@@ -555,14 +562,26 @@
             if ( queryControl != NULL )
                 {
                 queryControl->RevealSecretText( EFalse );
+			if(aType == EEventKey)
+			{
                 HBufC* cbaLabel = NULL;
 				Dprint( (_L("CSCPQueryDialog::OfferKeyEventL(): R_SCPDIALOG_OK_TEXT") ));
                 TRAPD ( err , cbaLabel= StringLoader::LoadL(R_SCPDIALOG_OK_TEXT) );
                 if ( err == KErrNone )
                 {
+					if (isCallSoftkeyAdded)
+					{
+						isCallSoftkeyAdded = EFalse;
+						ButtonGroupContainer().RemoveCommandFromStack(0,EAknSoftkeyEmergencyCall);
+					}
+					else
+					{
+					ButtonGroupContainer().RemoveCommandFromStack(0,EAknSoftkeyOk);
+					}
                 TRAP ( err , ButtonGroupContainer().AddCommandToStackL(0,EAknSoftkeyOk,*cbaLabel) );
                 ButtonGroupContainer().DrawDeferred();
                 delete cbaLabel;
+				}
             	  }
                 }
             }
@@ -715,6 +734,15 @@
                 TRAP ( err, cbaLabel= StringLoader::LoadL(R_SCPDIALOG_OK_TEXT) );
                 if ( err == KErrNone )
                 {
+                	if (isCallSoftkeyAdded)
+						{
+							isCallSoftkeyAdded = EFalse;
+							ButtonGroupContainer().RemoveCommandFromStack(0,EAknSoftkeyEmergencyCall);
+						}
+						else
+						{
+							ButtonGroupContainer().RemoveCommandFromStack(0,EAknSoftkeyOk);
+						}
                 	TRAP ( err , ButtonGroupContainer().AddCommandToStackL(0, EAknSoftkeyOk, *cbaLabel) );
                 	ButtonGroupContainer().DrawDeferred();
                 	delete cbaLabel;
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPServer/inc/SCPServer.h
--- a/terminalsecurity/SCP/SCPServer/inc/SCPServer.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/inc/SCPServer.h	Mon Jan 18 21:00:49 2010 +0200
@@ -216,7 +216,7 @@
     SCPPolicyElements
     };      
 
-const TInt KSCPDefaultMaxTO( 0 );
+const TInt KSCPDefaultMaxTO( 1440 );
 
 // reasons for server panic
 enum TSCPServPanic
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h
--- a/terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h	Mon Jan 18 21:00:49 2010 +0200
@@ -51,8 +51,6 @@
 const TInt KSCPTypeHours = 1;
 const TInt KSCPTypeDays = 2;
 
-const TInt KSCPNoteTimeout = 2000000;
-
 _LIT( KSCPTSConfigFile, "SCPTimestampPlugin.ini");
 _LIT( KDriveZ, "Z:" );
 _LIT(KSCPTimestampPluginResFilename, "\\Resource\\SCPTimestampPluginLang.rsc");
diff -r a9c0ce913924 -r 5594fba90824 terminalsecurity/SCP/SCPTimestampPlugin/src/SCPTimestampPlugin.cpp
--- a/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPTimestampPlugin.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPTimestampPlugin.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -589,19 +589,22 @@
             HBufC16* resText = NULL;
             TRAPD( err, resText = LoadResourceL( R_SET_SEC_CODE_AGING ) );         
             FormatResourceString(*resText);        
-            if ( err == KErrNone ) // If this fails, go on anyway to signal the psw change
+            if (err == KErrNone) // If this fails, go on anyway to signal the psw change
                 {
-    	        TPtr16 bufDes = resText->Des();
-                
+                TPtr16 bufDes = resText->Des();
+                TRequestStatus userResponse;
+
+                CAknGlobalNote* note = CAknGlobalNote::NewLC();
                 TRAP_IGNORE(
-                    CAknGlobalNote* note = CAknGlobalNote::NewLC();
-    		        note->ShowNoteL( EAknGlobalWarningNote, bufDes );
-    		        CleanupStack::PopAndDestroy( note );
-    		        );    	        
-    	        
-    	        // Wait here a while so the dialog won't appear on top of the note
-                User::After( KSCPNoteTimeout ); 
-                
+                        note->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);
+                        note->ShowNoteL(userResponse, EAknGlobalWarningNote,
+                                bufDes);
+                );
+
+                // Wait for the User Response
+                User::WaitForRequest(userResponse);
+                CleanupStack::PopAndDestroy(note);
+
                 delete resText;
                 }