--- a/calendarui/organizerplugin/aiagendapluginengine/src/AIAgendaPluginEngineImpl.cpp	Mon Mar 15 12:40:18 2010 +0200
+++ b/calendarui/organizerplugin/aiagendapluginengine/src/AIAgendaPluginEngineImpl.cpp	Wed Mar 31 21:29:10 2010 +0300
@@ -51,8 +51,6 @@
 {
     TRACE_ENTRY_POINT;
     
-    iSession.ConnectL();
-
     if( iObserverType == ECalendarObserver || iObserverType == ECalendarAndTodoObserver )
     {
         TCallBack environmentChangeCallBack( EnvironmentChangeCallBack, this );
@@ -157,7 +155,6 @@
     iInstanceArray.ResetAndDestroy();
     iInstanceArray.Close();
 
-    iSession.Close();
     
     TRACE_EXIT_POINT;
 }
@@ -182,9 +179,9 @@
     {
         case EDBOffline:
         {
-            iDBState = EDBInitializing;
-            iSession.Initialize( *this );
-        }
+            iDBState = EDBInitialized;
+            StateMachine();
+         }
         break;
 
         case EDBInitialized:
@@ -556,7 +553,6 @@
     delete iCalendarEngine;
     iCalendarEngine = NULL;
 
-    iSession.Uninitialize();
     
     TRACE_EXIT_POINT;
 }
@@ -880,22 +876,6 @@
 }
 
 // ---------------------------------------------------------
-// CAIAgendaPluginEngineImpl::CalendarServerInitialized
-// ?implementation_description
-// (other items were commented in a header).
-// ---------------------------------------------------------
-//
-void CAIAgendaPluginEngineImpl::CalendarServerInitialized(void)
-{
-    TRACE_ENTRY_POINT;
-    
-    iDBState = EDBInitialized;  // EDBInitializing -> EDBInitialized
-    StateMachine();
-    
-    TRACE_EXIT_POINT;
-}
-
-// ---------------------------------------------------------
 // CAIAgendaPluginEngineImpl::EnvironmentChangeCallBack
 // ?implementation_description
 // (other items were commented in a header).