--- a/bluetoothengine/btnotif/btnotifwrapper/src/btnotifwrapperproxy.cpp	Wed Aug 18 09:59:05 2010 +0300
+++ b/bluetoothengine/btnotif/btnotifwrapper/src/btnotifwrapperproxy.cpp	Fri Sep 17 08:30:56 2010 +0300
@@ -24,6 +24,7 @@
 #include <ecom/implementationproxy.h>
 #include <btmanclient.h>
 #include <btextnotifiers.h>
+#include <btnotif.h>
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <btextnotifierspartner.h>
 #endif
@@ -41,11 +42,11 @@
 /** Channel for OBEX passkey notifiers */
 //const TUid KBTObexAuthChannel = {0x00000603};
 /** Channel for power mode query */
-//const TUid KBTPowerModeChannel = {0x00000605};
+const TUid KBTPowerModeChannel = {0x00000605};
 /** Channel for query notifiers */
 //const TUid KBTQueryChannel = {0x00000606};
 /** Channel for power mode query */
-//const TUid KBTInfoChannel = {0x00000610};
+const TUid KBTInfoChannel = {0x00000610};
 
 
 // ======== LOCAL FUNCTIONS ========
@@ -84,7 +85,10 @@
     // KBTUserConfirmationNotifierUid for incoming JW dedicated bonding.
     
     CreateAndAppendNotifierLC( *notifiers, KDeviceSelectionNotifierUid, KBTDiscoveryChannel );
+    
+    CreateAndAppendNotifierLC( *notifiers, KBTGenericInfoNotifierUid, KBTInfoChannel );
 
+    CreateAndAppendNotifierLC( *notifiers, KPowerModeSettingNotifierUid, KBTPowerModeChannel );
     /*
      * todo:
      * Other notifiers to be migrated:
@@ -92,12 +96,8 @@
      * existing stack notifiers:
      * CreateAndAppendNotifierL( aArray, KPbapAuthNotifierUid, KBTObexPINChannel );
      * 
-     * S60 SDK API:
-     * CreateAndAppendNotifierL( aArray, KPowerModeSettingNotifierUid, KBTPowerModeChannel );
-     *
      * S60-defined platform:
      * CreateAndAppendNotifierL( aArray, KBTObexPasskeyQueryNotifierUid, KBTObexPINChannel );
-     * CreateAndAppendNotifierL( aArray, KBTGenericInfoNotifierUid, KBTInfoChannel );
      * CreateAndAppendNotifierL( aArray, KBTGenericQueryNotifierUid, KBTQueryChannel );
      * 
      * new (PAN-related):