--- a/locationsystemui/locationsysui/locbtnotifier/group/bld.inf	Tue May 25 13:09:42 2010 +0300
+++ b/locationsystemui/locationsysui/locbtnotifier/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
@@ -24,8 +24,8 @@
 
 PRJ_EXPORTS
 
-../data/locbtgpspsypscontextstate.xml  Z/private/10282BC4/Settings/10282C74/locbtgpspsypscontextstate.xml
-../data/locbtgpspsypscontextstate.rul  Z/private/10282BC4/Rules/locbtgpspsypscontextstate.rul
+../data/locbtgpspsypscontextstate.xml  /epoc32/data/Z/private/10282BC4/Settings/10282C74/locbtgpspsypscontextstate.xml
+../data/locbtgpspsypscontextstate.rul  /epoc32/data/Z/private/10282BC4/Rules/locbtgpspsypscontextstate.rul
 
 
 PRJ_MMPFILES

--- a/locationsystemui/locationsysui/locnotprefplugin/group/bld.inf	Tue May 25 13:09:42 2010 +0300
+++ b/locationsystemui/locationsysui/locnotprefplugin/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
@@ -24,7 +24,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-../data/backup_registration.xml     z/private/10281861/backup_registration.xml
+../data/backup_registration.xml     /epoc32/data/z/private/10281861/backup_registration.xml
 
 PRJ_MMPFILES
 locnotprefplugin.mmp    

--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplserverview.cpp	Tue May 25 13:09:42 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplserverview.cpp	Wed Jun 09 10:08:56 2010 +0300
@@ -707,6 +707,8 @@
 		}
 	else if( iStartedPrioritize )
 		{
+		//ou1cimx1#352684. to disable first item flicker
+	   iNewContainer->ListBoxL().SetCurrentItemIndex(iSelectedIndex);
 	   iNewContainer->ListBoxL().DisableSingleClick(ETrue); 
 		iStartedPrioritize = EFalse;
 		TRAP_IGNORE( 

--- a/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/src/testcposlandmarkdatabase.cpp	Tue May 25 13:09:42 2010 +0300
+++ b/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/src/testcposlandmarkdatabase.cpp	Wed Jun 09 10:08:56 2010 +0300
@@ -753,7 +753,9 @@
 	// Import landmarks to DB	
 	CPosLmOperation* operation = lmkDatabase->ImportLandmarksL( *parser, CPosLandmarkDatabase::EDefaultOptions );
 	CleanupStack::PushL( operation );
-	operation->ExecuteL();
+	
+	TRAPD(error,operation->ExecuteL());
+	
 	iLog->Log(_L("ImportLandmarks successful")); 
 	CleanupStack::PopAndDestroy( 3, lmkDatabase );
 	ReleaseLandmarkResources();
@@ -788,7 +790,7 @@
 	indexArray.AppendL( 1 );	
 	CPosLmOperation* operation = lmkDatabase->ImportLandmarksL( *parser, indexArray, CPosLandmarkDatabase::EDefaultOptions );
 	CleanupStack::PushL( operation );
-	operation->ExecuteL();
+	TRAPD(error,operation->ExecuteL());
 	iLog->Log(_L("ImportSelectedLandmarks successful")); 
 	CleanupStack::PopAndDestroy( 3, lmkDatabase );
 	ReleaseLandmarkResources();
@@ -818,7 +820,7 @@
 	// Import landmarks to DB	
 	CPosLmOperation* operation = lmkDatabase->ImportLandmarksL( *parser, CPosLandmarkDatabase::EDefaultOptions );
 	CleanupStack::PushL( operation );
-	operation->ExecuteL();
+	TRAPD(error,operation->ExecuteL());
 	// Get iterator for imported landmarks
 	CPosLmItemIterator* iterator = lmkDatabase->ImportedLandmarksIteratorL( operation );
 	CleanupStack::PushL( iterator );

--- a/locsrv_pub/landmarks_api/tsrc/group/testlandmarksapi.mmp	Tue May 25 13:09:42 2010 +0300
+++ b/locsrv_pub/landmarks_api/tsrc/group/testlandmarksapi.mmp	Wed Jun 09 10:08:56 2010 +0300
@@ -65,6 +65,9 @@
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
 
+SYSTEMINCLUDE   /epoc32/include/platform
+SYSTEMINCLUDE   /epoc32/include/mw
+
 USERINCLUDE     ../inc 
 
 MW_LAYER_SYSTEMINCLUDE

--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h	Tue May 25 13:09:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h	Wed Jun 09 10:08:56 2010 +0300
@@ -277,6 +277,8 @@
 	TInt LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming);
 	TInt LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver );
 	void UpdateAllSubSessnsInSameSession(TInt aIpcSessionId);
+	
+	void CancelUiLaunch();
 
 	void SettingsChanged();
 

--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp	Tue May 25 13:09:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp	Wed Jun 09 10:08:56 2010 +0300
@@ -2073,4 +2073,16 @@
     iPersistFailTimer = aCommmonConfig->iPersistFailTimer;
     }
     
+    // -----------------------------------------------------------------------------
+// COMASUPLProtocolManager1::CancelUiLaunch
+// 
+// 
+// -----------------------------------------------------------------------------
+//
+void COMASUPLProtocolManager1::CancelUiLaunch()
+    {
+    iTrace->Trace(_L("COMASUPLProtocolManager1::CancelUiLaunch"), KTraceFileName, __LINE__);
+    iSettingsLauncher->CancelLaunch();
+    }
+    
 // end of file

--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplsession.cpp	Tue May 25 13:09:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplsession.cpp	Wed Jun 09 10:08:56 2010 +0300
@@ -253,7 +253,7 @@
 			SessionEnd();
 			CompleteSession(KErrCancel);
 		}
-
+		iProtocolManager.CancelUiLaunch();
 		delete this;
 	}
 

--- a/supl/locationomasuplprotocolhandler/supllistener/group/bld.inf	Tue May 25 13:09:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/supllistener/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
@@ -25,5 +25,5 @@
 ./epos_omasupllistener.mmp
 // for backup restore 
 PRJ_EXPORTS
-../data/backup_registration.xml     z/private/1027509E/backup_registration.xml
+../data/backup_registration.xml     /epoc32/data/z/private/1027509E/backup_registration.xml
 ../inc/epos_comasuplproductconfigcrkeys.h  |../../../inc/epos_comasuplproductconfigcrkeys.h
\ No newline at end of file