--- a/javaextensions/pim/framework/src.s60/cpimmanager.cpp	Tue May 11 16:07:20 2010 +0300
+++ b/javaextensions/pim/framework/src.s60/cpimmanager.cpp	Tue May 25 12:34:19 2010 +0300
@@ -20,7 +20,6 @@
 #include "cpimmanager.h"
 #include <e32std.h>
 #include <badesca.h>
-#include <calsession.h>
 #include "pimcommon.h"
 #include "mpimcontactadaptermanager.h"
 #include "mpimeventadaptermanager.h"
@@ -45,14 +44,9 @@
 #include "pimjnitools.h"
 #include "pimutils.h"
 #include "jstringutils.h"
-#include "fs_methodcall.h"
 #include "logger.h"
 #include "cpimlocalizationmanager.h"
 
-#include "s60commonutils.h"
-
-
-
 // CONSTANTS
 
 /**
@@ -80,23 +74,7 @@
     = (MPIMLocalizationManager*)(CPIMLocalizationManager::NewL());
 
     createServerToNewThread();
-        CallMethodL(this, &CPIMManager::CreateCalSessionL, this);
-    }
-
-void CPIMManager::CreateCalSessionL()
-    {
-    		iCalSession = CCalSession::NewL();    	   		
-    		TRAPD(err, iCalSession->OpenL(iCalSession->DefaultFileNameL()));
-        if ( KErrNotFound == err)
-        {
-          iCalSession->CreateCalFileL(iCalSession->DefaultFileNameL());
-          iCalSession->OpenL(iCalSession->DefaultFileNameL());
-        }
-        else
-        {
-          User::LeaveIfError(err);
-        }      			    			
-    }
+}
 
 pimbasemanager* pimbasemanager::getInstance()
 {
@@ -156,17 +134,10 @@
     iContactValidator = NULL;
     delete iEventValidator;
     iEventValidator = NULL;
-    delete iToDoValidator;    
-    CallMethod(this, &CPIMManager::DeleteSessions, this);   
-
+    delete iToDoValidator;
     iToDoValidator = NULL;
     stopServer();
 }
-void CPIMManager::DeleteSessions()
-	{
-    delete iCalSession;
-    iCalSession = NULL;
-	}
 
 void CPIMManager::dispose()
 {
@@ -364,11 +335,12 @@
 
     MPIMEventAdapterManager* eventAdapterManager = NULL;
     MPIMEventListAdapter* eventListAdapter = NULL;
-    MPIMLocalizationData* localizationData = NULL;    
+    MPIMLocalizationData* localizationData = NULL;
+
     const TInt n = iAdapterAccesses.Count();
     for (TInt i = 0; i < n; i++)
     {
-        if (iAdapterAccesses[i]->OpenEventListL(iCalSession,aListName,
+        if (iAdapterAccesses[i]->OpenEventListL(aListName,
                                                 &eventAdapterManager, &eventListAdapter, &localizationData))
         {
             // got one
@@ -397,11 +369,12 @@
 
     MPIMToDoAdapterManager* toDoAdapterManager = NULL;
     MPIMToDoListAdapter* toDoListAdapter = NULL;
-    MPIMLocalizationData* localizationData = NULL;    
+    MPIMLocalizationData* localizationData = NULL;
+
     const TInt n = iAdapterAccesses.Count();
     for (TInt i = 0; i < n; i++)
     {
-        if (iAdapterAccesses[i]->OpenToDoListL(iCalSession,aListName, &toDoAdapterManager,
+        if (iAdapterAccesses[i]->OpenToDoListL(aListName, &toDoAdapterManager,
                                                &toDoListAdapter, &localizationData))
         {
             // got one