imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp Thu Jul 15 18:59:26 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp Thu Aug 19 10:13:51 2010 +0300
@@ -301,20 +301,27 @@
// set observing conditions
CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- addCondition->AddObjectConditionL( videoDef );
- addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
- CleanupStack::Pop( addCondition );
+
+ CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( videoDef );
+ CleanupStack::PushL( &addObjectCondition );
+
+ CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
+ CleanupStack::PushL( &addPropertyCondition );
CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- modifyCondition->AddObjectConditionL( videoDef );
- addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
- CleanupStack::Pop( modifyCondition );
+ CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( videoDef );
+ CleanupStack::PushL( &modifyObjectCondition );
+
+ CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
+ CleanupStack::PushL( &modifyPropertyCondition );
// add observer
iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd );
// modify observer
iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
+
+ CleanupStack::Pop( 6, addCondition );
TN_DEBUG1( "CThumbAGVideoObserver::AddObserversL() - end" );
}