diff -r 2b4ea9893b66 -r 6b6920c56e2f supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h --- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h Tue Aug 31 15:37:04 2010 +0300 +++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h Wed Sep 01 12:24:21 2010 +0100 @@ -41,7 +41,9 @@ * @since S60 v3.1 */ -class COMASuplConnRequestor : public CActive +class COMASuplConnRequestor : public CActive, + public MOMASuplUICompletionObserver, + public MOMASuplDialogTimeOutNotifier { enum TConnState @@ -183,6 +185,7 @@ void GetUsedServerAddress(TDes& aHSLPAddressUsed); + void SettingsUICompletedL(TInt aError); void SettingsUsageUICompletedL(TInt /*aError*/) {} void SettingsTimeOutUICompletedL(TInt /*aError*/) {} TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId); @@ -224,7 +227,7 @@ * @param None * @return None */ - //virtual void DialogTimerExpiredL(); + virtual void DialogTimerExpiredL(); protected : // Functions from CActive /** * From CActive @@ -298,6 +301,15 @@ TBool iIsSettingInitilized; TInt64 iCurrentSLPId; + + COMASuplDialogTimer* iDialogTimer; + + TBool iIapDialogShown; + + TBool iIapDlgTimerExpired; + + TBool iIsTimeoutDialogTimerStarted; + TBool iPrompt; TBool iWlanOnly;