diff -r ce1c7ad1f18b -r bcb43dc84c44 photosgallery/viewframework/medialists/tsrc/ut_cglxattributecontext/ut_cglxattributecontext.cpp
--- a/photosgallery/viewframework/medialists/tsrc/ut_cglxattributecontext/ut_cglxattributecontext.cpp	Mon Mar 15 12:40:30 2010 +0200
+++ b/photosgallery/viewframework/medialists/tsrc/ut_cglxattributecontext/ut_cglxattributecontext.cpp	Wed Mar 31 21:31:03 2010 +0300
@@ -46,7 +46,7 @@
     delete this;
     }
     
-TBool CGlxDRMUtility::CheckOpenRightsL(const TDesC&, TBool)
+TBool CGlxDRMUtility::ItemRightsValidityCheckL(const TDesC&, TBool)
     {
     return ETrue;
     }
@@ -76,8 +76,7 @@
 UT_CGlxAttributeContext* UT_CGlxAttributeContext::NewL()
     {
     UT_CGlxAttributeContext* self = UT_CGlxAttributeContext::NewLC();
-    CleanupStack::Pop();
-
+    CleanupStack::Pop( self );
     return self;
     }
 
@@ -200,13 +199,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop( attributes );
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop( itemIndices );
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy( mediaList );
     }
 
 void UT_CGlxAttributeContext::FetchOneItem_IndexZeroL()
@@ -241,13 +240,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchOneItem_IndexOneL()
@@ -282,13 +281,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchOneItem_IndexTwoL()
@@ -323,13 +322,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchOneItem_IndexThreeL()
@@ -364,13 +363,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchOneItem_IndexFourL()
@@ -405,13 +404,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchItems_GranularityLessThanRange_IndexZeroL()
@@ -446,13 +445,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchItems_GranularityLessThanRange_IndexOneL()
@@ -487,13 +486,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemindices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchItems_GranularityLessThanRange_IndexTwoL()
@@ -528,13 +527,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchItems_GranularityLessThanRange_IndexThreeL()
@@ -569,13 +568,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchItems_GranularityLessThanRange_IndexFourL()
@@ -610,13 +609,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchItems_GranularityLessThanRange_IndexFiveL()
@@ -651,13 +650,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 void UT_CGlxAttributeContext::FetchItems_GranularityGreaterThanRangeL()
@@ -692,13 +691,13 @@
     delete attributeSpecs;
     attributeSpecs = NULL;
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(attributes);
     attributes.Close();
 
-    CleanupStack::Pop();
+    CleanupStack::Pop(itemIndices);
     itemIndices.Close();
 
-    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy(mediaList);
     }
 
 TBool UT_CGlxAttributeContext::FindAttribute(RArray<TMPXAttribute>& aAttributes, const TMPXAttribute& aAttribute)
@@ -718,7 +717,7 @@
     CGlxMediaListTest* self = new (ELeave) CGlxMediaListTest();
     CleanupStack::PushL(self);
     self->ConstructL(aNumberOfMedia);
-    CleanupStack::Pop();
+    CleanupStack::Pop(self);
     return self;
     }
 
@@ -777,7 +776,7 @@
             }
 
         iMedias.AppendL(cGlxMedia);
-        CleanupStack::Pop();
+        CleanupStack::Pop(cGlxMedia);
         }
 
     TGlxMedia tGlxMedia(id, cGlxMedia);