diff -r 33ae025ac1e8 -r 8e4539ab1889 harvester/server/src/harvesterao.cpp --- a/harvester/server/src/harvesterao.cpp Mon May 03 12:55:01 2010 +0300 +++ b/harvester/server/src/harvesterao.cpp Fri May 14 16:17:23 2010 +0300 @@ -780,8 +780,6 @@ TTimeIntervalSeconds timeOffsetSeconds = User::UTCOffset(); - TInt fastHarvestPlaceholderCount = 0; - TInt endindex( iPHArray.Count() ); for( TInt i = 0; i < endindex; i++ ) { @@ -846,6 +844,7 @@ iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, 1 ); CleanupStack::PopAndDestroy( entry ); CleanupStack::PopAndDestroy( phData ); + CleanupStack::PopAndDestroy( mdeObject ); continue; } phData->SetUri( uri ); @@ -872,6 +871,7 @@ i--; endindex--; iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, 1 ); + CleanupStack::PopAndDestroy( mdeObject ); continue; } CleanupStack::PushL( phData ); @@ -946,7 +946,6 @@ // skip if( hd->TakeSnapshot() ) { - fastHarvestPlaceholderCount++; hd->SetObjectType( EFastHarvest ); } else @@ -983,15 +982,10 @@ iMdESession->AddObjectsL( mdeObjectArray ); } - const TInt eventObjectCount = objectCount - fastHarvestPlaceholderCount; - - if( eventObjectCount > 0 ) - { - iHarvesterEventManager->IncreaseItemCount( EHEObserverTypePlaceholder, - eventObjectCount ); - iHarvesterEventManager->SendEventL( EHEObserverTypePlaceholder, EHEStateStarted, - iHarvesterEventManager->ItemCount( EHEObserverTypePlaceholder ) ); - } + iHarvesterEventManager->IncreaseItemCount( EHEObserverTypePlaceholder, + objectCount ); + iHarvesterEventManager->SendEventL( EHEObserverTypePlaceholder, EHEStateStarted, + iHarvesterEventManager->ItemCount( EHEObserverTypePlaceholder ) ); #ifdef _DEBUG for (TInt i = 0; i < objectCount; ++i) @@ -2457,7 +2451,7 @@ // check if partial restore was done before last boot TBool partialRestore = iRestoreWatcher->Register(); -#ifdef __WINSCW__ +#if defined(__WINSCW__) || defined(FF_PLATFORM_SIMULATOR) partialRestore = ETrue; #endif