imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp Thu Sep 02 20:45:11 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp Fri Sep 17 08:32:20 2010 +0300
@@ -317,19 +317,14 @@
// set observing conditions
CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
-
- CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( imageDef );
- CleanupStack::PushL( &addObjectCondition );
+ addCondition->AddObjectConditionL( imageDef );
- CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
- CleanupStack::PushL( &addPropertyCondition );
+ addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( imageDef );
- CleanupStack::PushL( &modifyObjectCondition );
+ modifyCondition->AddObjectConditionL( imageDef );
- CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
- CleanupStack::PushL( &modifyPropertyCondition );
+ modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
// add observers
iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd );
@@ -337,7 +332,7 @@
// modify observer
iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
- CleanupStack::Pop( 6, addCondition );
+ CleanupStack::Pop( 2, addCondition );
TN_DEBUG1( "CThumbAGImageObserver::AddObserversL() - end" );
OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_ADDOBSERVERSL, "CThumbAGImageObserver::AddObserversL - end" );