--- a/bluetoothengine/bteng/src/btengserver.cpp	Fri Apr 16 15:08:36 2010 +0300
+++ b/bluetoothengine/bteng/src/btengserver.cpp	Mon May 03 12:40:50 2010 +0300
@@ -165,7 +165,7 @@
     iWatcher = CBTEngSrvKeyWatcher::NewL( this );
     iSettingsMgr = CBTEngSrvSettingsMgr::NewL( this );
     iPluginMgr = CBTEngSrvPluginMgr::NewL( this );
-    iBBConnMgr = CBTEngSrvBBConnMgr::NewL( iSocketServ );
+    iBBConnMgr = CBTEngSrvBBConnMgr::NewL( this, iSocketServ );
 
     User::LeaveIfError( iBTRegServ.Connect() );
     iPairMan = CBTEngPairMan::NewL( *this );
@@ -256,12 +256,11 @@
 // ?implementation_description
 // ---------------------------------------------------------------------------
 //
-void CBTEngServer::DisconnectAllL()
+void CBTEngServer::DisconnectAllForPowerOffL()
     {
     TRACE_FUNC_ENTRY
-    iPluginMgr->DisconnectAllPlugins();
     TCallBack cb( DisconnectAllCallBack, this );
-    iBBConnMgr->DisconnectAllLinksL( cb );
+    iBBConnMgr->DisconnectAllLinksForPowerOffL( cb );
     }