--- a/bluetoothengine/btnotif/src/btnpairnotifier.cpp	Wed Sep 15 12:23:51 2010 +0300
+++ b/bluetoothengine/btnotif/src/btnpairnotifier.cpp	Wed Oct 13 14:43:49 2010 +0300
@@ -70,17 +70,27 @@
     }
 
 // ----------------------------------------------------------
-// CBTNPairNotifierBase::ProcessStartParamsL
+// CBTNPairNotifierBase::GetParamsL
 // ----------------------------------------------------------
 //
-void CBTNPairNotifierBase::ProcessStartParamsL()
+void CBTNPairNotifierBase::GetParamsL(const TDesC8& aBuffer, TInt aReplySlot, const RMessagePtr2& aMessage)
     {
+    (void)aBuffer;
+    if( !iMessage.IsNull() )
+        {
+        User::Leave(KErrInUse);
+        }
+
+    iMessage = (RMessage2)aMessage;
+    iReplySlot = aReplySlot;
+
     if ( AutoLockOnL() )
         {
         // The phone is locked, access denied.
         //
         CompleteMessage(KErrCancel);
         }
+
     }
 
 // ----------------------------------------------------------
@@ -115,23 +125,13 @@
         BtNotifNameUtils::SetDeviceNameL(pckg().DeviceName(), *iDevice);
 
     // Finally show new prompt for dialog if it is still on the screen
-    // and user has not given a alias for device.
-        CBTNotifUIUtil* dialog = NULL;
-        if ( !iNotifUiUtil->IsQueryReleased())
-            {
-            dialog = iNotifUiUtil;
-            }
-        else if ( !iAuthoriseDialog->IsQueryReleased())
-            {
-            dialog = iAuthoriseDialog;
-            }
-                    
-        if( dialog && !iDevice->IsValidFriendlyName() )
+    // and user has not given a alias for device.   
+        if( !iNotifUiUtil->IsQueryReleased() && !iDevice->IsValidFriendlyName() )
             {
             RBuf prompt;
             prompt.CleanupClosePushL();
             GenerateQueryPromptL( prompt );
-            dialog->UpdateQueryDlgL( prompt );
+            iNotifUiUtil->UpdateQueryDlgL( prompt );
             CleanupStack::PopAndDestroy( &prompt );
             }
         }
@@ -213,9 +213,8 @@
 
     devName.Zero();
     // Show query for use to accept/reject incoming pairing request
-    TInt keypress = iAuthoriseDialog->ShowQueryL( prompt, R_BT_GENERIC_QUERY, 
-             ECmdBTnotifUnavailable, devName, CAknQueryDialog::EConfirmationTone);
-    
+    TInt keypress = iNotifUiUtil->ShowQueryL( prompt, R_BT_GENERIC_QUERY, 
+             ECmdBTnotifUnavailable, devName, CAknQueryDialog::EConfirmationTone );
     CleanupStack::PopAndDestroy( &prompt );
 
     if( iMessage.IsNull() ) // cancelled by the stack