diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp
--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cphonebookdispatcherTraces.h"
-#endif
-
 #include "cphonebookdispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchphonebookinterface.h>
@@ -1055,7 +1049,7 @@
  * @param aPhonebook The phonebook to reset the cache for.
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook);
 
 	__ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter));
 	
@@ -1077,8 +1071,8 @@
  * @param aMaxNumberLength The maximum number length in the Fdn phonebook.
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aTotalEntries=%d, aMaxTextLength=%d, aMaxNumberLength=%d"), 
-							aError, aTotalEntries, aMaxTextLength, aMaxNumberLength);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aTotalEntries=%d,aMaxTextLength=%d,aMaxNumberLength=%d"), 
+							aError,aTotalEntries,aMaxTextLength,aMaxNumberLength);
 
 	TName phoneBookName(KETelIccFdnPhoneBook);
 	CPhoneBookDataPackage phoneBookDataPackage;
@@ -1110,7 +1104,7 @@
  * @see CPhoneBookEntry::ExternalizeToTlvEntry()
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook);
 	
 	__ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter));	
 	
@@ -1121,7 +1115,7 @@
 	
 	if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown))
 		{
-		//fill the CTSY pointer
+		//fill the CTSY pointer		
         TRAP ( aError, 
                 CArrayPtrSeg<CPhoneBookStoreEntry>* readEntries = new(ELeave) CArrayPtrSeg<CPhoneBookStoreEntry>(1);
                 iPhonebookReadPtrs[aPhonebook] = readEntries;
@@ -1180,7 +1174,7 @@
  * @see CPhoneBookEntry::ExternalizeToTlvEntry()
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook);
 	
 	__ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter));
 	
@@ -1195,7 +1189,7 @@
                 CArrayPtrSeg<CPhoneBookStoreEntry>* readEntries = new(ELeave) CArrayPtrSeg<CPhoneBookStoreEntry>(1);
                 iPhonebookCachePtrs[aPhonebook] = readEntries;
                 FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook])));
-		
+        
 		if(aError)
 			{
 			iPhonebookCachePtrs[aPhonebook]->ResetAndDestroy();
@@ -1343,7 +1337,7 @@
  * @see RMobilePhoneBookStore::Write() 
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d, aIndex=%d, aMaxNumberLength=%d"), aError, aPhonebook, aIndex, aMaxNumberLength);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d,aIndex=%d,aMaxNumberLength=%d"), aError, aPhonebook, aIndex, aMaxNumberLength);
 
 	__ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter));
 	
@@ -1515,7 +1509,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBOOKDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhonebookDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CPhonebookDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)