--- a/datacommsserver/esockserver/MobilityCoreProviders/inc/mobilitymcpractivities.h	Thu Dec 17 09:22:25 2009 +0200
+++ b/datacommsserver/esockserver/MobilityCoreProviders/inc/mobilitymcpractivities.h	Thu Jan 07 13:34:53 2010 +0200
@@ -1,9 +1,9 @@
 // Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -12,7 +12,7 @@
 //
 // Description:
 // Mobility Meta Connection Provider Activities
-//
+// 
 //
 
 /**
@@ -38,7 +38,7 @@
 DECLARE_EXPORT_ACTIVITY_MAP(mobilityMCprActivities)
 
 
-///////////////////////////////////////////////////////////////////////////////
+//
 //CMobilityActivity
 class CMobilityActivity : public MeshMachine::CNodeRetryActivity
 	{
@@ -49,7 +49,7 @@
 	CMobilityActivity(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
 	virtual ~CMobilityActivity();
 	typedef MeshMachine::TNodeContext<CMobilityMetaConnectionProvider, MCprStates::TContext> TContext;
-
+	
 private:
 	TBool EvaluatePreference(TContext& aContext);
     void SetHandshakingFlag();
@@ -57,33 +57,28 @@
 
 private:
 	ESock::RMetaServiceProviderInterface* iCurrent;
-	ESock::RMetaServiceProviderInterface* iAvailable;
-	ESock::RMetaServiceProviderInterface* iCandidate;
+	ESock::RMetaServiceProviderInterface* iPreferred;
 	const TUint iAvailabilityScoreTreshold;
 
 
 public:
-
+		
 	DECLARE_SMELEMENT_HEADER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange, MeshMachine::TState<TContext>, NetStateMachine::MState, TContext)
 		virtual TBool Accept();
 	DECLARE_SMELEMENT_FOOTER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange)
-
+	
 	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobility, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
 		virtual TInt TransitionTag();
-	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobility)
-
-	DECLARE_SMELEMENT_HEADER(TNoTagOrReConnectOrStartMobilityHandshakeBackwards, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
-		virtual TInt TransitionTag();
-	DECLARE_SMELEMENT_FOOTER(TNoTagOrReConnectOrStartMobilityHandshakeBackwards)
+	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobility)	
 
 	DECLARE_SMELEMENT_HEADER(TNoTagOrStartMobilityHandshakeBackwards, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
 		virtual TInt TransitionTag();
 	DECLARE_SMELEMENT_FOOTER(TNoTagOrStartMobilityHandshakeBackwards)
-
+	
 	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
 		virtual TInt TransitionTag();
 	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger)
-
+	
 	DECLARE_SMELEMENT_HEADER(TClearHandshakingFlag, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
 		virtual void DoL();
 	DECLARE_SMELEMENT_FOOTER(TClearHandshakingFlag)
@@ -121,7 +116,7 @@
 		)
 	};
 
-///////////////////////////////////////////////////////////////////////////////
+//
 //CConnectionRecoveryActivity
 class CConnectionRecoveryActivity : public MeshMachine::CNodeRetryActivity
 	{