--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_glxcommandhandlerback/Src/t_cglxcommandhandlerback.cpp	Mon Mar 15 12:40:30 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_glxcommandhandlerback/Src/t_cglxcommandhandlerback.cpp	Wed Mar 31 21:31:03 2010 +0300
@@ -36,8 +36,7 @@
     {
     EUNIT_PRINT(_L("t_cglxcommandhandlerback::NewL()"));
     t_cglxcommandhandlerback* self = t_cglxcommandhandlerback::NewLC();
-    CleanupStack::Pop();
-
+    CleanupStack::Pop( self );
     return self;
     }
 
@@ -46,9 +45,7 @@
     EUNIT_PRINT(_L("ut_cglxcommandhandlerback::NewLC()"));
     t_cglxcommandhandlerback* self = new( ELeave ) t_cglxcommandhandlerback();
     CleanupStack::PushL( self );
-
     self->ConstructL();
-
     return self;
     }
 
@@ -83,10 +80,8 @@
   iMediaList = MGlxMediaList::InstanceL(*path);
 	if(iMediaList)
     	{
-    	
     	// Attribute to be used
     	TMPXAttribute attrTitle(KMPXMediaGeneralTitle);
-    	//TMPXAttribute attrCount(KMPXMediaGeneralCount);
     	
     	// add a static items
 	    TGlxMediaId testId(12345);
@@ -105,7 +100,7 @@
     	CleanupStack::Pop(newMedia2);
     	}
     
-    CleanupStack::PopAndDestroy(); // path
+    CleanupStack::PopAndDestroy( path );
     }
     
 MGlxMediaList& t_cglxcommandhandlerback::MediaList()
@@ -138,15 +133,12 @@
 void t_cglxcommandhandlerback::SetupPreviousNaviViewChWithoutMlL(  )
     {
     EUNIT_PRINT(_L("t_cglxcommandhandlerback::SetupPreviousNaviViewChWithoutMlL(  )"));
-   // iCommand = CGlxCommandHandlerBack::NewPreviousNaviViewCommandHandlerL();
     }
     
 void t_cglxcommandhandlerback::SetupPreviousNaviViewChWithMlL(  )
     {
     EUNIT_PRINT(_L("t_cglxcommandhandlerback::SetupPreviousNaviViewChWithMlL(  )"));
     CreateMediaListL();
-    
-  //  iCommand = CGlxCommandHandlerBack::NewPreviousNaviViewCommandHandlerL(this);
     }
 
 void t_cglxcommandhandlerback::SetupContainerPreviousViewChWithoutViewId(  )