diff -r 15986eb6c500 -r 25f95128741d windowing/windowserver/nga/SERVER/openwfc/CLIENT.CPP --- a/windowing/windowserver/nga/SERVER/openwfc/CLIENT.CPP Wed Mar 31 23:34:07 2010 +0300 +++ b/windowing/windowserver/nga/SERVER/openwfc/CLIENT.CPP Wed Apr 14 17:19:46 2010 +0300 @@ -51,7 +51,6 @@ CWsClient* CWsClient::iCurrentClient; CWsObject* CWsClient::iDestObj; const TUint8* CWsClient::iNextCmd; -CIdle* CWsClient::iMoreCommands=NULL; TUint CWsClient::iConnectionId = CDebugLogBase::EDummyConnectionId+1; CArrayFixFlat* CWsClient::iSystemPointerCursors = NULL; @@ -549,7 +548,7 @@ // Dispatch the command to the WServ object that will process it iDestObj->CommandL(opcode, cmdParams); // (call #5) } - while(iNextCmdIsReadyToRun()); + while(iNextCmdStart(TCallBack(CWsClient::DoContinueDeferredServiceOfCommandBuf,this)); // (call #3.1.1) iCurrentClient=NULL; #if defined(_DEBUG) @@ -578,13 +575,6 @@ #endif } -TInt CWsClient::DoContinueDeferredServiceOfCommandBuf(TAny* aClient) // (step #3.1.1) - { - static_cast(aClient)->DoServiceCommandBuf(); // (call #3.1) - return KErrNone; - } - - void CWsClient::ExecuteAsyncClientCommandL(TInt aOpcode, const RMessage2& aMessage) // (step #3.2) { switch(aOpcode) @@ -1997,7 +1987,6 @@ void CWsClient::InitStaticsL() { - iMoreCommands=CIdle::NewL(EClientBufferPriority); } void CWsClient::DeleteStatics() @@ -2012,8 +2001,6 @@ iTextCursorArray = NULL; } - delete iMoreCommands; - iMoreCommands=NULL; // coverity[extend_simple_error] }