# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284545307 -10800
# Node ID a082c848c9a90c78e7ca52a36e89d090def00cec
# Parent  5cc2995847eae24c92c292ab7abbb299ad4fb0a1
Revision: 201035
Kit: 201036

diff -r 5cc2995847ea -r a082c848c9a9 fotaapplication/fotaserver/FotaServer/src/fotaSrvSession.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/fotaSrvSession.cpp	Tue Sep 14 22:54:36 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/src/fotaSrvSession.cpp	Wed Sep 15 13:08:27 2010 +0300
@@ -167,6 +167,7 @@
 	TFullName cltnm = clt.FullName();
 	FLOG(_L( "CFotaSrvSession::ServiceL      %d   serving for %S?" )
 			,aMessage.Function(), &cltnm );
+	clt.Close();
 
 	TInt cmd = aMessage.Function();
 	if(( cmd!= EGetState ) && (cmd!= EGetResult ))
diff -r 5cc2995847ea -r a082c848c9a9 fotaapplication/fotaserver/fmserver/src/fmsserversession.cpp
--- a/fotaapplication/fotaserver/fmserver/src/fmsserversession.cpp	Tue Sep 14 22:54:36 2010 +0300
+++ b/fotaapplication/fotaserver/fmserver/src/fmsserversession.cpp	Wed Sep 15 13:08:27 2010 +0300
@@ -104,6 +104,7 @@
 	RThread clt; aMessage.ClientL(clt); TFullName cltnm = clt.FullName();
 	FLOG(_L( "CFMSSession::ServiceL      %d   serving for %S?" )
 			,aMessage.Function(), &cltnm );
+	clt.Close();
 	if( CheckClientSecureIdL( aMessage ) )
 		{
 		//already one request pending
diff -r 5cc2995847ea -r a082c848c9a9 omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserItem.cpp
--- a/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserItem.cpp	Tue Sep 14 22:54:36 2010 +0300
+++ b/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBrowserItem.cpp	Wed Sep 15 13:08:27 2010 +0300
@@ -181,7 +181,7 @@
                                                                   (TInt)iUID));
     
     // Force the browser to use the User Defined AP selection mode.
-    User::LeaveIfError( repository->Set( KBrowserAccessPointSelectionMode,
+    User::LeaveIfError( repository->Set( KBrowserOccAccessPointSelectionMode,
                                          KUserDefined ) );
     // This sets the accesspoint default for browser.
     User::LeaveIfError( repository->Set( KBrowserDefaultAccessPoint,
diff -r 5cc2995847ea -r a082c848c9a9 omaprovisioning/provisioning/help/data/xhtml.zip
Binary file omaprovisioning/provisioning/help/data/xhtml.zip has changed
diff -r 5cc2995847ea -r a082c848c9a9 remotemgmt_plat/device_management_parameter_api/inc/lawmoadaptercrkeys.h
--- a/remotemgmt_plat/device_management_parameter_api/inc/lawmoadaptercrkeys.h	Tue Sep 14 22:54:36 2010 +0300
+++ b/remotemgmt_plat/device_management_parameter_api/inc/lawmoadaptercrkeys.h	Wed Sep 15 13:08:27 2010 +0300
@@ -32,6 +32,7 @@
 const TUint32 KLawmoCorrelator = 0x00000002;
 const TUint32 KLawmoWipeStatus = 0x00000003;
 const TUint32 KLawmoSourceURI = 0x00000004;
+const TUint32 KLawmoSyncRetVal = 0x00000005;
 
 #endif // LawmoADAPTERCRKEYS_H
             
diff -r 5cc2995847ea -r a082c848c9a9 syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver2.mmp
--- a/syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver2.mmp	Tue Sep 14 22:54:36 2010 +0300
+++ b/syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver2.mmp	Wed Sep 15 13:08:27 2010 +0300
@@ -21,7 +21,7 @@
 
 // This server has read and write capabilities for device and user data
 CAPABILITY		ReadUserData WriteUserData ReadDeviceData WriteDeviceData NetworkServices
-EPOCHEAPSIZE	0x500 0x400000	// minimum and maximum heap sizes
+EPOCHEAPSIZE	0x500 0x800000	// minimum and maximum heap sizes
 VENDORID		VID_DEFAULT
 UID				0 0x101F99FE
 TARGET			nsmldshostserver2.exe
diff -r 5cc2995847ea -r a082c848c9a9 syncmlfw/ds/netmon/src/CNetMon.cpp
--- a/syncmlfw/ds/netmon/src/CNetMon.cpp	Tue Sep 14 22:54:36 2010 +0300
+++ b/syncmlfw/ds/netmon/src/CNetMon.cpp	Wed Sep 15 13:08:27 2010 +0300
@@ -106,6 +106,8 @@
 {
 	 DBG_FILE(_S8("CNetMon::~CNetMon() begins"));
 	 
+	 Cancel();
+	 
 	 DBG_FILE(_S8("CNetMon::~CNetMon() ends"));
 }
 
@@ -176,12 +178,7 @@
 	
 	//CancelTimer();
 
-    // Un-register for events
-    iConnectionMonitor.CancelNotifications();
-    iConnectionMonitor.Close();
-
-    // Cleanup sync session
-    CloseSyncSession();
+    Complete();
 	
 	DBG_FILE(_S8("CNetMon::DoCancel() ends"));
 }
@@ -510,7 +507,12 @@
 {
     DBG_FILE(_S8("CNetMon::Complete() begins"));
     
-	Cancel();
+    // Un-register for events
+    iConnectionMonitor.CancelNotifications();
+    iConnectionMonitor.Close();
+    
+    // Cleanup sync session
+    CloseSyncSession();
 
     // Close the server
     CActiveScheduler::Stop();