diff -r 05bc53fe583b -r 83ca720e2b9a connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ActiveWrapper.cpp --- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ActiveWrapper.cpp Tue Aug 31 15:35:44 2010 +0300 +++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ActiveWrapper.cpp Wed Sep 01 12:23:51 2010 +0100 @@ -71,15 +71,7 @@ // CActiveWrapper::CActiveWrapper( const TUint aIndexOfNote ) : CActive( CActive::EPriorityStandard ), - iSSID( NULL ), - iConnectionMode( NULL ), - iSecurityMode( NULL ), - iExtSecurityMode( NULL ), - iProtectedSetupSupported( NULL ), - iRS( NULL ), - iIndexOfNote( aIndexOfNote ), - iKey( NULL ), - iHex( NULL ) + iIndexOfNote( aIndexOfNote ) { } @@ -207,6 +199,23 @@ break; } + case EConnViaDestCM: + { + iNotif.CancelConnectedViaDestAndConnMethodNote(); + break; + } + + case EChangingConnTo: + { + iNotif.CancelChangingConnectionToNote(); + break; + } + + case EConnViaCM: + { + iNotif.CancelConnectedViaConnMethodNote(); + break; + } case EWlanEasyWep: { iNotif.CancelEasyWepDlg(); @@ -428,6 +437,31 @@ break; } + case EConnViaDestCM: + { + iNotif.ConnectedViaDestAndConnMethodNote( aDestId, aConnMId, + iStatus ); + break; + } + + case EChangingConnTo: + { + iNotif.ChangingConnectionToNote( aConnMId, iStatus ); + break; + } + + case EConnViaCM: + { + iNotif.ConnectedViaConnMethodNote( aConnMId, iStatus ); + break; + } + + case ENoWlanNetwsAvail: + { + iNotif.NoWLANNetworksAvailableNote( iStatus ); + break; + } + default: { return; @@ -462,4 +496,41 @@ return iStatus.Int(); } +// --------------------------------------------------------- +// CActiveWrapper::StartConnectingViaDiscreetPopup +// +// Starts the active object +// --------------------------------------------------------- +// +void CActiveWrapper::StartConnectingViaDiscreetPopup( TPckgBuf< TConnUiConnectingViaDiscreetPopup>& aInfo ) + { + if ( IsActive() == EFalse ) + { + iIndexOfNote = EConnectingViaDiscreetPopup; + iNotif.ConnectingViaDiscreetPopup( aInfo, iStatus ); + SetActive(); + iWait.Start(); + } + + } + + +// --------------------------------------------------------- +// CActiveWrapper::StartConnectionErrorDiscreetPopup +// +// Starts the active object +// --------------------------------------------------------- +// +void CActiveWrapper::StartConnectionErrorDiscreetPopup( TPckgBuf& aErrCode ) + { + if ( IsActive() == EFalse ) + { + iIndexOfNote = EConnectionErrorDiscreetPopup; + iNotif.ConnectionErrorDiscreetPopup( aErrCode, iStatus ); + SetActive(); + iWait.Start(); + } + + } + // End of File