--- a/webservices/wscore/inc/senmobilityobserver.h	Fri Jun 18 15:01:02 2010 +0100
+++ b/webservices/wscore/inc/senmobilityobserver.h	Thu Jul 22 16:44:27 2010 +0100
@@ -22,13 +22,10 @@
 #define M_SEN_MOBILITY_OBSERVER_H
 
 //  INCLUDES
-#include <flogger.h>
 #include <e32std.h>
 #include <in_sock.h>
 #include <es_enum.h>
-#include <CommDbConnPref.h>
 #include <comms-infras/cs_mobility_apiext.h>
-#include <connpref.h>
 #include "SenXmlReader.h"
 #include "MSenTransport.h"
 #include "SenWSDescription.h"
@@ -76,7 +73,6 @@
 	TUint32 GetActiveIap() ;
 	HBufC8* GetNewIapAsTransportPropertyL() ;
 	TUint32 GetActiveSnap() ;
-	void SetDialogPref(TBool aDialogPref) ;
 	TInt OpenConnectionL(TDesC8& aAppTransportProperties,
 							 MSenTransport &aTransport,
 							 CSenWSDescription& aInitializer,
@@ -92,6 +88,9 @@
 	TInt StartConnection(TUint32& aId, TBool aIsSnapId) ;
 	TInt OpenSocketSever() ;
 	void RefreshAvailabilityL() ;
+	TInt SetID(TUint32 aId, TBool aDialogPref, RConnection& aConnection, RSocketServ& aSocketServer, TBool aSNAP);
+	TBool IsOCCImplementedSDK();
+	TInt GetS60PlatformVersion(TUint& aMajor, TUint& aMinor);
 
 	/**
 	* By default Symbian OS constructor is private.
@@ -104,10 +103,9 @@
 	TUint32 iIapId;
 	TUint32 iNewIapId;
 	TUint32 iSnapId;
-	TCommDbConnPref iPrefs;      
-	TConnSnapPref iSNAPPrefs;      
-	 CSenXmlReader &iReader ;
-	private:    // Data
+	CSenXmlReader &iReader ;
+	TBool iOCCenabled;
+	private:    // Data	      
 	};
     
 #endif /*M_SEN_MOBILITY_OBSERVER_H    */