diff -r 773449708c84 -r 4ad59aaee882 javaextensions/pim/agnadapter/src.s60/cpimagnlistadapter.cpp --- a/javaextensions/pim/agnadapter/src.s60/cpimagnlistadapter.cpp Thu Sep 02 20:20:40 2010 +0300 +++ b/javaextensions/pim/agnadapter/src.s60/cpimagnlistadapter.cpp Fri Sep 17 08:28:21 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "cpimagnlistadapter.h" #include "mpimitemdata.h" -#include "javasymbianoslayer.h" +#include "cleanupresetanddestroy.h" #include "cpimagnserverwait.h" #include "logger.h" @@ -54,12 +54,14 @@ // ----------------------------------------------------------------------------- // void CPIMAgnListAdapter::ConstructL( - MCalChangeCallBack::TChangeEntryType aEntryType) + + MCalChangeCallBack::TChangeEntryType aEntryType, + CCalSession* aCalSession) { JELOG2(EPim); + iServerWait = CPIMAgnServerWait::NewL(); - iCalSession = CCalSession::NewL(); - iCalSession->OpenL(iCalSession->DefaultFileNameL()); + iCalSession = aCalSession; iCalEntryView = CCalEntryView::NewL(*iCalSession, *iServerWait); iServerWait->WaitCompleteL(KServerMaxWait); @@ -285,10 +287,9 @@ void CPIMAgnListAdapter::CloseAgendaSession() { JELOG2(EPim); + iCalSession->StopChangeNotification(); delete iCalEntryView; iCalEntryView = NULL; - - delete iCalSession; iCalSession = NULL; iChangesRead = ETrue;