diff -r 6c10323ce807 -r 7e2761e776bd bluetoothengine/bteng/src/btengserver.cpp --- a/bluetoothengine/bteng/src/btengserver.cpp Wed Apr 28 08:52:24 2010 +0300 +++ b/bluetoothengine/bteng/src/btengserver.cpp Sun May 02 21:30:11 2010 +0300 @@ -37,7 +37,6 @@ #include "btengsecpolicy.h" #include "btengprivatepskeys.h" #include "btengplugin.h" -#include "btengpairman.h" #include "debug.h" /** Bluetooth Engine server thread name */ @@ -167,8 +166,6 @@ iPluginMgr = CBTEngSrvPluginMgr::NewL( this ); iBBConnMgr = CBTEngSrvBBConnMgr::NewL( this, iSocketServ ); - User::LeaveIfError( iBTRegServ.Connect() ); - iPairMan = CBTEngPairMan::NewL( *this ); TCallBack idleCb( IdleTimerCallBack, this ); iIdleCallBack.Set( idleCb ); @@ -225,9 +222,7 @@ delete iPluginMgr; delete iBBConnMgr; delete iServerState; - delete iPairMan; iSocketServ.Close(); - iBTRegServ.Close(); } // --------------------------------------------------------------------------- @@ -315,7 +310,6 @@ TRACE_INFO( ( _L( "[CBTEngServer]\t iSessionCount %d"), iSessionCount )) iSessionCount--; iSettingsMgr->SessionClosed( aSession ); - iPairMan->SessionClosed( aSession ); if( aAutoOff ) { TRAP_IGNORE( SetPowerStateL( EBTOff, ETrue ) );