diff -r 9386f31cc85b -r 269724087bed bluetoothengine/btnotif/src/BTNAuthNotifier.cpp --- a/bluetoothengine/btnotif/src/BTNAuthNotifier.cpp Wed Sep 01 12:20:04 2010 +0100 +++ b/bluetoothengine/btnotif/src/BTNAuthNotifier.cpp Tue Sep 14 21:37:10 2010 +0300 @@ -107,22 +107,14 @@ } // ---------------------------------------------------------- -// CBTAuthNotifier::GetParamsL +// CBTAuthNotifier::ProcessStartParamsL // Initialize parameters and check if device is already // in registry. Jump to RunL as soon as possible. // ---------------------------------------------------------- // -void CBTAuthNotifier::GetParamsL(const TDesC8& aBuffer, TInt aReplySlot, const RMessagePtr2& aMessage) +void CBTAuthNotifier::ProcessStartParamsL() { - FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::GetParamsL()")); - - if( !iMessage.IsNull()) - { - User::Leave(KErrInUse); - } - - iMessage = aMessage; - iReplySlot = aReplySlot; + FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::ProcessStartParamsL()")); if ( AutoLockOnL() ) { @@ -134,7 +126,7 @@ TBTAuthorisationParams param; TPckgC pckg(param); - pckg.Set(aBuffer); + pckg.Set(*iParamBuffer); iServiceUid = pckg().iUid.iUid; // Pick up service uid from message iBTAddr = pckg().iBDAddr; @@ -171,13 +163,13 @@ } #ifdef _DEBUG - FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::GetParamsL() Executing authorisation...")); + FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::ProcessStartParamsL() Executing authorisation...")); TBuf<12> deviceAddressString; pckg().iBDAddr.GetReadable(deviceAddressString); FTRACE(FPrint(_L("[BTNOTIF]\t BT Address: %S"), &deviceAddressString)); - FTRACE(FPrint(_L("[BTNOTIF]\t CBTAuthNotifier::GetParamsL Service Uid: %d = 0x%X"), iServiceUid, iServiceUid )); + FTRACE(FPrint(_L("[BTNOTIF]\t CBTAuthNotifier::ProcessStartParamsL Service Uid: %d = 0x%X"), iServiceUid, iServiceUid )); #endif - FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::GetParamsL() completed")); + FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::ProcessStartParamsL() completed")); } // ----------------------------------------------------------