--- a/bluetoothengine/btnotif/btnotifsrv/inc/btnotifpairnotifier.h	Fri Jun 11 13:48:51 2010 +0300
+++ b/bluetoothengine/btnotif/btnotifsrv/inc/btnotifpairnotifier.h	Wed Jun 23 18:23:52 2010 +0300
@@ -20,16 +20,17 @@
 
 #include <e32base.h>
 #include <btmanclient.h>
+#include <hb/hbcore/hbsymbianvariant.h>
 #include "bluetoothdevicedialogs.h"
 #include "btnotificationresult.h"
 #include "bluetoothtrace.h"
 
-class CBTNotifPairingManager;
+class CBTNotifSecurityManager;
 class CBTNotifConnectionTracker;
 class CBluetoothNotification;
 
 /**
- *  Helper class for performing user prompt for pairing and authorization.
+ *  Helper class for performing user prompt for pairing.
  *  
  *  The design of this class is focussed on structure and maintainability first.
  *  Duplicate (state) information is kept to a minimum. And memory usage comes
@@ -37,8 +38,6 @@
  *  only instantiated when there is pairing-related processing, so extreme
  *  focus on memory or processing efficiency would have relatively little effect.
  *  
- *  Auth represents Authenticate and Authorize
- *  
  *  @since Symbian^4
  */
 NONSHARABLE_CLASS( CBTNotifPairNotifier ) : public CBase,
@@ -53,7 +52,7 @@
      * @param aDevice Pointer to information of the remote device.
      * aParam The owner of this object
      */
-    static CBTNotifPairNotifier* NewL( CBTNotifPairingManager& aParent );
+    static CBTNotifPairNotifier* NewL( CBTNotifSecurityManager& aParent );
 
     /**
     * Destructor.
@@ -118,7 +117,7 @@
     /**
      * C++ default constructor.
      */
-    CBTNotifPairNotifier( CBTNotifPairingManager& aParent );
+    CBTNotifPairNotifier( CBTNotifSecurityManager& aParent );
 
     /**
      * Symbian 2nd-phase constructor.
@@ -154,7 +153,7 @@
      * @param aResult The user response; ETrue if the user accepted the query,
      *                otherwise EFalse.
      */
-    void CompleteAcceptPairingQueryL( TInt aError, TBool aResult );
+    void CompleteAcceptPairingQueryL( TInt aError);
     
     /**
      * Parse the parameters of a request for pairing.
@@ -231,13 +230,6 @@
      */
     void NotificationClosedL( TInt aError, const TDesC8& aData );
     
-    /**
-     * Ask the user if he/she wants to block future connection requests.
-     *
-     * @since Symbian^4
-     */    
-    void LaunchBlockingQueryL();
-
 private: // data
 
     enum TNotifierState
@@ -246,7 +238,7 @@
         EPairingInputConfirm,
         };
     
-    CBTNotifPairingManager& iParent;
+    CBTNotifSecurityManager& iParent;
     
     /**
      * The client request.
@@ -290,6 +282,11 @@
     
     TNotifierState iState;
     
+    // Defines if the check box in the dialog is checked or not.
+    TBool   iCheckBoxState;
+    
+    TBool   iAcceptPairingResult;
+    
     BTUNITTESTHOOK
 
     };