diff -r a828660c511c -r d3d7683d16f5 wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanmgmtimpl.cpp --- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanmgmtimpl.cpp Tue Aug 31 17:02:06 2010 +0300 +++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanmgmtimpl.cpp Wed Sep 01 12:41:05 2010 +0100 @@ -16,7 +16,7 @@ */ /* -* %version: 34 % +* %version: 31.1.2 % */ // INCLUDE FILES @@ -530,8 +530,7 @@ // void CWlanMgmtImpl::RunProtectedSetup( TRequestStatus& aStatus, - const TWlanSsid& aSsid, - const TWlanWpsPin& aWpsPin, + TUint32 aId, CArrayFixSeg& aCredentials ) { TraceDump( INFO_LEVEL, ( _L( "CWlanMgmtImpl::RunProtectedSetup()" ) ) ); @@ -541,7 +540,7 @@ aStatus = KRequestPending; iPendingProtectedSetupStatus = &aStatus; - iProtectedSetupRequest = new CProtectedSetupRequest( *this, iServer, aSsid, aWpsPin, aCredentials ); + iProtectedSetupRequest = new CProtectedSetupRequest( *this, iServer, aId, aCredentials ); if ( !iProtectedSetupRequest ) { User::RequestComplete( iPendingProtectedSetupStatus, KErrNoMemory ); @@ -1211,14 +1210,12 @@ CProtectedSetupRequest::CProtectedSetupRequest( CWlanMgmtImpl& aCallback, RWLMServer& aServer, - const TWlanSsid& aSsid, - const TWlanWpsPin& aWpsPin, + TUint32 aId, CArrayFixSeg& aCredentials ) : CActive( CActive::EPriorityStandard ), iCallback( aCallback ), iServer( aServer ), - iSsid( aSsid ), - iWpsPin( aWpsPin ), + iServiceId( aId ), iCredentials ( aCredentials ), iCredentialsBuf( iCredentialsStorage ) { @@ -1241,7 +1238,7 @@ void CProtectedSetupRequest::IssueRequest() { TraceDump( INFO_LEVEL, ( _L( "CProtectedSetupRequest::IssueRequest()" ) ) ); - iServer.RunProtectedSetup( iStatus, iSsid, iWpsPin, iCredentialsBuf ); + iServer.RunProtectedSetup( iStatus, iServiceId, iCredentialsBuf ); SetActive(); }