--- a/textinput/peninputarc/src/peninputclient/penclientimpl.cpp	Tue May 11 16:31:42 2010 +0300
+++ b/textinput/peninputarc/src/peninputclient/penclientimpl.cpp	Tue May 25 13:03:44 2010 +0300
@@ -77,40 +77,6 @@
     }
     
     
-   
-CPeninputServerWaiter* CPeninputServerWaiter::NewL()
-    {
-    CPeninputServerWaiter* self = new(ELeave)CPeninputServerWaiter;
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-void CPeninputServerWaiter::ConstructL()    
-    {
-    iWaitScheduler = new(ELeave) CActiveSchedulerWait;
-    }
-    
-CPeninputServerWaiter::~CPeninputServerWaiter()
-    {
-    delete iWaitScheduler;
-    }
-    
-void CPeninputServerWaiter::Start()
-    {
-    iWaitScheduler->Start();
-    }
-    
-void CPeninputServerWaiter::Stop(TInt aFlag)
-    {
-    //if(aFlag)
-    iError = aFlag ? KErrNone : aFlag;
-    
-    iWaitScheduler->AsyncStop();
-    }
-    
-    
-    
 // ======== MEMBER FUNCTIONS ========
 
 // ---------------------------------------------------------------------------
@@ -152,7 +118,6 @@
     iServerExit = EFalse;
     iLaunchServer = EFalse;
     iCurPenUiType = -1; 
-    iWaitScheduler = NULL; 
     iAppPrefferedUiMode = EPluginInputModeNone;
     iAutoOpenFlag = ETrue;
     iBackgroundCtrl = 0;
@@ -1010,15 +975,15 @@
     iSingletonServer->SendReceive(EPeninputRequestAddUiObserver,arg);        
     
     }
-  */  
+  */
+/*
 void RPeninputServerImpl::OnServerReady( TBool aFlag)    
-    {
+   {
     //iLaunchServer = EFalse;
     
-    iWaitScheduler->Stop(aFlag);//AsyncStop();
     //if(iPenUiNotificationHandler)
       // DoAddPenUiActivationHandler(); 
-    }
+    }*/
 // ---------------------------------------------------------------------------
 // RPeninputServerImpl::AddPenUiActivationHandler
 // Add an UI activate/deactivation handler
@@ -1097,8 +1062,6 @@
     {
     delete iBackgroundCtrl;  
       
-    delete iWaitScheduler;
-    iWaitScheduler = 0;
     iPenUiNotificationHandler.Close();
     delete iObserver;
     iObserver = NULL;
@@ -1299,7 +1262,7 @@
             {
             exitReason = srvThread.ExitReason();        
             srvThread.Close();
-            iPeninputServer->OnServerReady(-1000);
+            //iPeninputServer->OnServerReady(-1000);
             }
         if(err != KErrNone || exitReason != 0) //server has exited
             {
@@ -1312,7 +1275,7 @@
 
     if(iStatus.Int() == ESignalServerReady) //server has started
         {
-        iPeninputServer->OnServerReady();
+        //iPeninputServer->OnServerReady();
         return;
         }
     //if there is also iUiActivationHandler, handle it first