--- a/javaextensions/pim/agnadapter/src.s60/cpimagnlistadapter.cpp	Fri Apr 30 10:40:48 2010 +0300
+++ b/javaextensions/pim/agnadapter/src.s60/cpimagnlistadapter.cpp	Tue May 11 16:07:20 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include "cpimagnlistadapter.h"
 #include "mpimitemdata.h"
-#include "cleanupresetanddestroy.h"
+#include "javasymbianoslayer.h"
 #include "cpimagnserverwait.h"
 #include "logger.h"
 
@@ -54,13 +54,15 @@
 // -----------------------------------------------------------------------------
 //
 void CPIMAgnListAdapter::ConstructL(
-    MCalChangeCallBack::TChangeEntryType aEntryType)
-{
+
+    MCalChangeCallBack::TChangeEntryType aEntryType,
+    CCalSession* aCalSession)
+    {
     JELOG2(EPim);
-    iServerWait = CPIMAgnServerWait::NewL();
-    iCalSession = CCalSession::NewL();
-    iCalSession->OpenL(iCalSession->DefaultFileNameL());
-    iCalEntryView = CCalEntryView::NewL(*iCalSession, *iServerWait);
+    
+    iServerWait = CPIMAgnServerWait::NewL();      
+    iCalSession = aCalSession;    
+    iCalEntryView = CCalEntryView::NewL(*iCalSession, *iServerWait);    	
     iServerWait->WaitCompleteL(KServerMaxWait);
 
     iCalSession->StartChangeNotification(this, aEntryType, ETrue, // include undated ToDos, if ToDos are observed
@@ -285,10 +287,9 @@
 void CPIMAgnListAdapter::CloseAgendaSession()
 {
     JELOG2(EPim);
+    iCalSession->StopChangeNotification();
     delete iCalEntryView;
-    iCalEntryView = NULL;
-
-    delete iCalSession;
+    iCalEntryView = NULL;   
     iCalSession = NULL;
 
     iChangesRead = ETrue;