diff -r b01126ce0bec -r ba63c83f4716 idlehomescreen/xmluicontroller/src/contentrenderer.cpp --- a/idlehomescreen/xmluicontroller/src/contentrenderer.cpp Wed Sep 15 12:00:00 2010 +0300 +++ b/idlehomescreen/xmluicontroller/src/contentrenderer.cpp Wed Oct 13 14:18:30 2010 +0300 @@ -442,7 +442,7 @@ TBool layoutChanged( EFalse ); - TRAPD( error, tr->CommitL( iFactory->PolicyArray(), propertyHashMap ) ); + TRAPD( error, tr->CommitL( layoutChanged, propertyHashMap ) ); if( error == KErrNone ) { @@ -464,8 +464,7 @@ ); - iFactory->ReleaseTransaction( tr ); - iFactory->ResetPolicyArray(); + iFactory->ReleaseTransaction( tr ); return error; } @@ -1015,10 +1014,10 @@ } iPolicyEvaluator->EvaluateContentPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); iPolicyEvaluator->EvaluateVisibilityPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); ProcessTransactionElementL( element ); } @@ -1132,10 +1131,10 @@ *target, aFile, priority ); iPolicyEvaluator->EvaluateContentPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); iPolicyEvaluator->EvaluateVisibilityPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); ProcessTransactionElementL( element ); } @@ -1215,10 +1214,10 @@ *target, aIndex ); iPolicyEvaluator->EvaluateEmptyContentPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); iPolicyEvaluator->EvaluateVisibilityPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); ProcessTransactionElementL( element ); @@ -1276,7 +1275,7 @@ RPropertyHashMap propertyHashMap; CleanupClosePushL( propertyHashMap ); - aElement->CommitL( iFactory->PolicyArray(), propertyHashMap ); + aElement->CommitL( layoutChanged, propertyHashMap ); SetPropertyArraysL( propertyHashMap ); CleanupStack::PopAndDestroy( &propertyHashMap ); @@ -1445,22 +1444,22 @@ if ( aResource ) { iPolicyEvaluator->EvaluateResourcePolicyL( - *target, *aResource, iFactory->PolicyArray() ); + *target, *aResource, element->PolicyArray() ); iPolicyEvaluator->EvaluateContentPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); iPolicyEvaluator->EvaluateVisibilityPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); } else { iPolicyEvaluator->EvaluateContentPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); iPolicyEvaluator->EvaluateVisibilityPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); } ProcessTransactionElementL( element ); @@ -1523,21 +1522,21 @@ if ( aResource ) { iPolicyEvaluator->EvaluateResourcePolicyL( - *target, *aResource, iFactory->PolicyArray() ); + *target, *aResource, element->PolicyArray() ); iPolicyEvaluator->EvaluateContentPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); iPolicyEvaluator->EvaluateVisibilityPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); } else { iPolicyEvaluator->EvaluateContentPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); iPolicyEvaluator->EvaluateVisibilityPolicyL( - *target, iFactory->PolicyArray() ); + *target, element->PolicyArray() ); } ProcessTransactionElementL( element );