diff -r a5fbfefd615f -r d575fd691cf9 harvester/harvesterserver/src/cblacklistmgr.cpp --- a/harvester/harvesterserver/src/cblacklistmgr.cpp Fri Jun 11 14:43:47 2010 +0300 +++ b/harvester/harvesterserver/src/cblacklistmgr.cpp Wed Jun 23 19:26:19 2010 +0300 @@ -153,52 +153,52 @@ } // ----------------------------------------------------------------------------- -// CBlacklistMgr::AddtoUnloadListL() +// CBlacklistMgr::AddtoDontloadListL() // ----------------------------------------------------------------------------- // -TInt CBlacklistMgr::AddtoUnloadListL( TUid aPluginUid ) +TInt CBlacklistMgr::AddtoDontloadListL( TUid aPluginUid ) { OstTraceFunctionEntry0( CBLACKLISTMGR_ADDTOUNLOADLISTL_ENTRY ); - OstTrace1( TRACE_NORMAL, CBLACKLISTMGR_ADDTOUNLOADLISTL, "CBlacklistMgr::AddtoUnloadListL;Uid=%x", aPluginUid.iUid ); - CPIXLOGSTRING2("CBlacklistMgr::AddtoUnloadListL(): Uid = %x " , aPluginUid.iUid ); + OstTrace1( TRACE_NORMAL, CBLACKLISTMGR_ADDTODONTLOADLISTL, "CBlacklistMgr::AddtoDontloadListL;Uid=%x", aPluginUid.iUid ); + CPIXLOGSTRING2("CBlacklistMgr::AddtoDontloadListL(): Uid = %x " , aPluginUid.iUid ); //Check if the record with given plugin uid is already available in database or not //If available just ignore the addition //If there is no record found in database with given uid, add new record with given uid TInt err = KErrNone; - if( !(iBlacklistDb->FindFromUnloadListL( aPluginUid.iUid )) ) + if( !(iBlacklistDb->FindInDontloadListL( aPluginUid.iUid )) ) { - err = iBlacklistDb->AddtoUnloadListL( aPluginUid.iUid ); + err = iBlacklistDb->AddtoDontloadListL( aPluginUid.iUid ); } - CPIXLOGSTRING("CBlacklistMgr::AddtoUnloadListL(): Exit"); - OstTraceFunctionExit0( CBLACKLISTMGR_ADDTOUNLOADLISTL_EXIT ); + CPIXLOGSTRING("CBlacklistMgr::AddtoDontloadListL(): Exit"); + OstTraceFunctionExit0( CBLACKLISTMGR_ADDTODONTLOADLISTL_EXIT ); return err; } // ----------------------------------------------------------------------------- -// CBlacklistMgr::RemoveFromUnloadListL() +// CBlacklistMgr::RemoveFromDontloadListL() // ----------------------------------------------------------------------------- // -void CBlacklistMgr::RemoveFromUnloadListL( TUid aPluginUid ) +void CBlacklistMgr::RemoveFromDontloadListL( TUid aPluginUid ) { OstTraceFunctionEntry0( CBLACKLISTMGR_REMOVEFROMUNLOADLISTL_ENTRY ); - OstTrace1( TRACE_NORMAL, CBLACKLISTMGR_REMOVEFROMUNLOADLISTL, "CBlacklistMgr::RemoveFromUnloadListL;Uid=%x", aPluginUid.iUid ); - CPIXLOGSTRING2("CBlacklistMgr::RemoveFromUnloadListL(): Uid = %x " , aPluginUid.iUid ); + OstTrace1( TRACE_NORMAL, CBLACKLISTMGR_REMOVEFROMUNLOADLISTL, "CBlacklistMgr::RemoveFromDontloadListL;Uid=%x", aPluginUid.iUid ); + CPIXLOGSTRING2("CBlacklistMgr::RemoveFromDontloadListL(): Uid = %x " , aPluginUid.iUid ); //Remove the item record to database - iBlacklistDb->RemoveFromUnloadListL( aPluginUid.iUid ); + iBlacklistDb->RemoveFromDontloadListL( aPluginUid.iUid ); - CPIXLOGSTRING("CBlacklistMgr::RemoveFromUnloadListL(): Exit"); - OstTraceFunctionExit0( CBLACKLISTMGR_REMOVEFROMUNLOADLISTL_EXIT ); + CPIXLOGSTRING("CBlacklistMgr::RemoveFromDontloadListL(): Exit"); + OstTraceFunctionExit0( CBLACKLISTMGR_REMOVEFROMDONTLOADLISTL_EXIT ); } // ----------------------------------------------------------------------------- -// CBlacklistMgr::FindfromUnloadListL() +// CBlacklistMgr::FindfromDontloadListL() // ----------------------------------------------------------------------------- // -TBool CBlacklistMgr::FindfromUnloadListL(TUid aPluginUid ) +TBool CBlacklistMgr::FindInDontloadListL(TUid aPluginUid ) { - CPIXLOGSTRING2("CBlacklistMgr::FindfromUnloadListL(): Uid = %x " , aPluginUid.iUid ); - OstTrace1( TRACE_NORMAL, CBLACKLISTMGR_FINDFROMUNLOADLISTL, "CBlacklistMgr::FindfromUnloadListL;Uid=%x", aPluginUid.iUid ); - return ( iBlacklistDb->FindFromUnloadListL( aPluginUid.iUid ) ); + CPIXLOGSTRING2("CBlacklistMgr::FindInDontloadListL(): Uid = %x " , aPluginUid.iUid ); + OstTrace1( TRACE_NORMAL, CBLACKLISTMGR_FINDINDONTLOADLISTL, "CBlacklistMgr::FindInDontloadListL;Uid=%x", aPluginUid.iUid ); + return ( iBlacklistDb->FindInDontloadListL( aPluginUid.iUid ) ); }