--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h	Fri May 14 16:17:02 2010 +0300
@@ -40,9 +40,7 @@
  *  @since S60 v3.1
  */
  
-class COMASuplConnRequestor : public CActive, 
-                              public MOMASuplUICompletionObserver,  
-                              public MOMASuplDialogTimeOutNotifier
+class COMASuplConnRequestor : public CActive
 {
 
 	enum TConnState
@@ -50,7 +48,8 @@
 		  EConnecting,
 		  EConnectionDone,
 	      ESending,
-	      EInitilizeSetting
+	      EInitilizeSetting,
+		  EInitialState
 		};
 
 	public :  // Constructor 
@@ -171,7 +170,6 @@
         
         void GetUsedServerAddress(TDes& aHSLPAddressUsed);
         
-        void SettingsUICompletedL(TInt aError);
         void SettingsUsageUICompletedL(TInt /*aError*/) {}
         void SettingsTimeOutUICompletedL(TInt /*aError*/) {}
         TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId);
@@ -213,7 +211,7 @@
 		 * @param None
 		 * @return None
 		 */
-		virtual void DialogTimerExpiredL();	
+		//virtual void DialogTimerExpiredL();	
   	protected :  // Functions from CActive
       /**
       * From CActive 
@@ -285,14 +283,6 @@
             TBool iIsSettingInitilized;
             
             TInt64 iCurrentSLPId;
-            
-            COMASuplDialogTimer* iDialogTimer;
-            
-            TBool iIapDialogShown;
-            
-            TBool iIapDlgTimerExpired;
-            
-            TBool iIsTimeoutDialogTimerStarted;
 
 };