--- a/webservices/wscore/inc/senmobilityobserver.h	Mon Jan 18 21:21:14 2010 +0200
+++ b/webservices/wscore/inc/senmobilityobserver.h	Tue Jan 26 13:03:48 2010 +0200
@@ -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,
@@ -104,8 +100,6 @@
 	TUint32 iIapId;
 	TUint32 iNewIapId;
 	TUint32 iSnapId;
-	TCommDbConnPref iPrefs;      
-	TConnSnapPref iSNAPPrefs;      
 	 CSenXmlReader &iReader ;
 	private:    // Data
 	};

--- a/webservices/wscore/src/senmobilityobserver.cpp	Mon Jan 18 21:21:14 2010 +0200
+++ b/webservices/wscore/src/senmobilityobserver.cpp	Tue Jan 26 13:03:48 2010 +0200
@@ -18,14 +18,15 @@
 
 
 // INCLUDE FILES
-
+#include <connpref.h>
+#include <commdbconnpref.h>
 #include "senmobilityobserver.h"
-#include <SenTransportProperties.h>
-#include "SenWSPattern.h"
-#include "MSenProperties.h"
-#include "SenLayeredTransportProperties.h"
-#include "SenLogger.h"
-#include "SenServiceManagerDefines.h"
+#include "sentransportproperties.h"
+#include "senwspattern.h"
+#include "msenproperties.h"
+#include "senlayeredtransportproperties.h"
+#include "senlogger.h"
+#include "senservicemanagerdefines.h"
 
 // -----------------------------------------------------------------------------
 // CALRObserver::NewL
@@ -534,20 +535,24 @@
 		    {
 			if(aIsSnapId != EFalse && aId)
                 {
+                TConnSnapPref SNAPPrefs;
                 iSnapId = aId ;
-                iSNAPPrefs.SetSnap( aId ); 
+                SNAPPrefs.SetSnap( aId ); 
                 // Start connecting with Snap
-                errRet = iConnection.Start(iSNAPPrefs);						
+                errRet = iConnection.Start(SNAPPrefs);						
                 TLSLOG_L(KSenSenMobilityLogChannelBase, KSenSenMobilityLogLevel , "- CALRObserver::StartConnection iConnection Started with SNAP");
                 }
 			else //default is iap
 				{
 	    	    if( aId )
                     {
-                    iPrefs.SetIapId( aId );
-                    SetDialogPref(EFalse) ;
+                    TCommDbConnPref iapPrefs ;
+                    iapPrefs.SetIapId( aId );
+					iapPrefs.SetDialogPreference( ECommDbDialogPrefDoNotPrompt );
+					TLSLOG_L(KSenSenMobilityLogChannelBase, KSenSenMobilityLogLevel , "- CALRObserver::SetDialogPref is FALSE");					
+					//iapPrefs.SetDialogPreference( ECommDbDialogPrefPrompt );					
                     // Start connecting with IAP
-                    errRet = iConnection.Start(iPrefs);
+                    errRet = iConnection.Start(iapPrefs);
                     TLSLOG_FORMAT((KSenSenMobilityLogChannelBase, KSenSenMobilityLogLevel , _L8("- CALRObserver::StartConnection connection started with iapid %d and preference"), aId));
                     }
 	            else
@@ -586,20 +591,6 @@
 	return errRet;
     }	
 
-void CALRObserver::SetDialogPref(TBool aDialogPref)
-    {
-    if (aDialogPref == EFalse)
-        {
-        TLSLOG_L(KSenSenMobilityLogChannelBase, KSenSenMobilityLogLevel , "- CALRObserver::SetDialogPref is FALSE");
-        iPrefs.SetDialogPreference( ECommDbDialogPrefDoNotPrompt );		
-        }
-    else
-        {
-        TLSLOG_L(KSenSenMobilityLogChannelBase, KSenSenMobilityLogLevel ,"- CALRObserver::SetDialogPref is TRUE");
-        iPrefs.SetDialogPreference( ECommDbDialogPrefPrompt );		
-        }	
-    }
-
 // -----------------------------------------------------------------------------
 // CALRObserver::RefreshAvailability
 // -----------------------------------------------------------------------------

--- a/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp	Mon Jan 18 21:21:14 2010 +0200
+++ b/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp	Tue Jan 26 13:03:48 2010 +0200
@@ -31,10 +31,10 @@
 #include <http.h>
 
 #include "sendebug.h" // filelogging and debugging MACROS
-#include <SenServiceConnection.h> // KErrSenNoHttpResponseBody
-#include <SenElement.h>
-#include <SenXmlUtils.h>
-#include <SenHttpTransportProperties.h>
+#include "senserviceconnection.h" // KErrSenNoHttpResponseBody
+#include "senelement.h"
+#include "senxmlutils.h"
+#include "senhttptransportproperties.h"
 #include "senhttpchannelimpl.h"
 #include "senhttpeventhandler.h"
 #include "sentxnstate.h"
@@ -47,10 +47,10 @@
 
 #include "senhttpchanneltransportplugin.h"
 //For HTTPProxyFilter
-#include <HttpFilterProxyInterface.h>
-#include <HttpFilterAcceptHeaderInterface.h>
-#include <HttpFilterCommonStringsExt.h>
-#include <DeflateFilterInterface.h>
+#include <httpfilterproxyinterface.h>
+#include <httpfilteracceptheaderinterface.h>
+#include <httpfiltercommonstringsext.h>
+#include <deflatefilterinterface.h>
 
 // CONSTANTS
 namespace

--- a/webservices/wshttpchanneltransportplugin/src/senhttpchanneltransportplugin.cpp	Mon Jan 18 21:21:14 2010 +0200
+++ b/webservices/wshttpchanneltransportplugin/src/senhttpchanneltransportplugin.cpp	Tue Jan 26 13:03:48 2010 +0200
@@ -26,25 +26,25 @@
 
 
 // INCLUDE FILES
-#include <SenServiceConnection.h>
+#include "senserviceconnection.h"
 #include "senhttpchanneltransportplugin.h"
 #include "senhttpchannelimpl.h"
 #include "senhttpsyncrequester.h"
-#include "SenXmlUtils.h"
-#include "SenIdentityProvider.h"
+#include "senxmlutils.h"
+#include "senidentityprovider.h"
 #include "senwspattern.h"
-#include "SenFragment.h"
-#include "SenElement.h"
+#include "senfragment.h"
+#include "senelement.h"
 #include "sendebug.h"
-#include "MSenProperty.h"
-#include "SenHttpTransportProperties.h" // Utils\inc
+#include "msenproperty.h"
+#include "senhttptransportproperties.h" // Utils\inc
 #include "sentransportcontext.h"
 #include "senlayeredhttptransportproperties.h" // internal Framework\inc
 #include "msenmessagecontext.h"
-#include "MSenMessage.h"
-#include "SenSoapMessage2.h"
-#include "RSenDocument.h"
-#include "SenParser.h"
+#include "msenmessage.h"
+#include "sensoapmessage2.h"
+#include "rsendocument.h"
+#include "senparser.h"
 #include "senservicesession.h"
 #include "senlogger.h"
 #include "senclientsession.h"