--- a/bluetoothengine/bteng/inc/btengsrvkeywatcher.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengsrvkeywatcher.h	Wed Sep 01 12:20:04 2010 +0100
@@ -60,24 +60,17 @@
      * @since S60 v3.2
      * @param ?arg1 ?description
      */
-    virtual void RequestCompletedL( CBTEngActive* aActive, 
+    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, 
                                      TInt aStatus );
 
     /**
-     * Callback for handling cancelation of an outstanding request.
-     *
-     * @param aId The ID that identifies the outstanding request.
-     */
-    virtual void CancelRequest( TInt aRequestId );
-    
-    /**
      * From MBTEngActiveObserver.
      * Notification that a key value has changed.
      *
      * @since S60 v3.2
      * @param ?arg1 ?description
      */
-    virtual void HandleError( CBTEngActive* aActive, TInt aError );
+    virtual void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
 
 private:
 
@@ -149,6 +142,11 @@
     RProperty iSspDebugModeKey;
     
     /**
+     * Property containing the BT registry change monitoring key
+     */
+    RProperty iBtRegistryKey;
+    
+    /**
      * Session with the central repository for BT SAP mode setting.
      * We load/unload BT SAP plugin.
      * Own.
@@ -210,6 +208,12 @@
     CBTEngActive* iSspDebugModeWatcher;
 
     /**
+     * Active object for subscribing to BT registry property changes.
+     * Own.
+     */
+    CBTEngActive* iBtRegistryWatcher;
+
+    /**
      * Pointer to our parent.
      * Not own.
      */