diff -r 854be117f6a5 -r c6043ea9b06a javaextensions/pim/agnadapter/src.s60/cpimeventadapteraccess.cpp --- a/javaextensions/pim/agnadapter/src.s60/cpimeventadapteraccess.cpp Thu Jun 17 22:39:53 2010 +0100 +++ b/javaextensions/pim/agnadapter/src.s60/cpimeventadapteraccess.cpp Fri Jun 18 16:25:31 2010 +0100 @@ -139,8 +139,7 @@ return EFalse; } -TBool CPIMEventAdapterAccess::OpenEventListL(CCalSession* aCalSession, - const TDesC* aListName, +TBool CPIMEventAdapterAccess::OpenEventListL(const TDesC* aListName, MPIMEventAdapterManager** aRetAdapterManager, MPIMEventListAdapter** aRetListAdapter, MPIMLocalizationData** aRetLocalizationData) @@ -182,9 +181,9 @@ CPIMAgnApptAdapter* adapter = CPIMAgnApptAdapter::NewL(iFuncServer); CleanupStack::PushL(adapter); - listAdapter = CPIMEventListAdapter::NewL(CCalEntry::EAppt,adapter, - iFuncServer, aCalSession); - + listAdapter = CPIMEventListAdapter::NewL(CCalEntry::EAppt, adapter, + iFuncServer); + CleanupStack::Pop(adapter); CleanupStack::Pop(adapterManager); @@ -201,8 +200,8 @@ CPIMAgnMemoAdapter* adapter = CPIMAgnMemoAdapter::NewL(iFuncServer); CleanupStack::PushL(adapter); - listAdapter = CPIMEventListAdapter::NewL(CCalEntry::EEvent,adapter, - iFuncServer, aCalSession); + listAdapter = CPIMEventListAdapter::NewL(CCalEntry::EEvent, adapter, + iFuncServer); CleanupStack::Pop(adapter); CleanupStack::Pop(adapterManager); @@ -220,8 +219,8 @@ CPIMAgnAnnivAdapter* adapter = CPIMAgnAnnivAdapter::NewL(iFuncServer); CleanupStack::PushL(adapter); - listAdapter = CPIMEventListAdapter::NewL(CCalEntry::EAnniv,adapter, - iFuncServer, aCalSession); + listAdapter = CPIMEventListAdapter::NewL(CCalEntry::EAnniv, adapter, + iFuncServer); CleanupStack::Pop(adapter); CleanupStack::Pop(adapterManager); @@ -245,11 +244,9 @@ return ETrue; } -TBool CPIMEventAdapterAccess::OpenToDoListL(CCalSession* /*aCalSession*/, - const TDesC* /*aListName*/, +TBool CPIMEventAdapterAccess::OpenToDoListL(const TDesC* /*aListName*/, MPIMToDoAdapterManager** /*aRetAdapterManager*/, - MPIMToDoListAdapter** /*aRetListAdapter*/, - MPIMLocalizationData** /*aRetLocalizationData*/) + MPIMToDoListAdapter** /*aRetListAdapter*/, MPIMLocalizationData** /*aRetLocalizationData*/) { JELOG2(EPim); // no ToDo lists