diff -r 0ba996a9b75d -r 613943a21004 bluetoothengine/bteng/inc/btengsrvkeywatcher.h
--- a/bluetoothengine/bteng/inc/btengsrvkeywatcher.h	Thu Aug 19 10:05:41 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengsrvkeywatcher.h	Tue Aug 31 15:25:10 2010 +0300
@@ -60,17 +60,24 @@
      * @since S60 v3.2
      * @param ?arg1 ?description
      */
-    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, 
+    virtual void RequestCompletedL( CBTEngActive* aActive, 
                                      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 aId, TInt aError );
+    virtual void HandleError( CBTEngActive* aActive, TInt aError );
 
 private:
 
@@ -142,11 +149,6 @@
     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.
@@ -208,12 +210,6 @@
     CBTEngActive* iSspDebugModeWatcher;
 
     /**
-     * Active object for subscribing to BT registry property changes.
-     * Own.
-     */
-    CBTEngActive* iBtRegistryWatcher;
-
-    /**
      * Pointer to our parent.
      * Not own.
      */