--- a/telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP	Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -18,6 +18,12 @@
 */
 
 
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ET_MANTraces.h"
+#endif
+
 #include <e32svr.h>
 #include <f32file.h>
 #include "ET_SSTD.H"
@@ -250,22 +256,18 @@
 	TInt found=iTsyModulesCon->FindByName(findHandle,name,foundName);	// Is already loaded?
 	if(found==KErrNone)
 		{	// The TSY is already loaded, we'll just open, and bump up the reference count.
-		LOGTEXT("LoadPhoneModuleL\tTSY already loaded - inc ref count");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_1, "LoadPhoneModuleL\tTSY already loaded - inc ref count");
 		CPhoneFactoryBase* s=REINTERPRET_CAST(CPhoneFactoryBase*,iTsyModulesCon->At(findHandle));
 		s->Open();
 		return s;
 		}
 
 	RLibrary lib;
-#ifdef _DEBUG
-	TBuf8<128> buf;
-	buf.Copy(aFileName);
-#endif // _DEBUG
-	LOGTEXT2("Loading %S", &buf);
+	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_2, "Loading %S", aFileName);
 	TInt r=lib.Load(aFileName);
 	if (r!=KErrNone)
 		User::Leave(r);
-	LOGTEXT2("Loaded %S", &buf);
+	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_3, "Loaded %S", aFileName);
 	TCleanupItem libClose(CloseLibrary,&lib);
 	CleanupStack::PushL(libClose);
 
@@ -276,12 +278,12 @@
 	TPhoneFactoryBaseNewL libEntry=(TPhoneFactoryBaseNewL)lib.Lookup(1);
 	if (libEntry==NULL)
 		User::Leave(KErrBadLibraryEntryPoint);
-	LOGTEXT("About to get CPhoneFactoryBase ptr");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_4, "About to get CPhoneFactoryBase ptr");
 	CPhoneFactoryBase* s=NULL;
 	s=(*libEntry)();	// libEntry may leave.
 	if(s==NULL)
 		User::Leave(KErrNoMemory);
-	LOGTEXT("Got CPhoneFactoryBase ptr");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_5, "Got CPhoneFactoryBase ptr");
 	TRAPD(error, s->ConstructL(lib));
 	if(error)
 		{
@@ -471,9 +473,9 @@
 				TName newName(tsyName);
 				newName.Append(KDash);
 				newName.Append(infoToMatch.iName);	// Create unique name
-				LOGTEXT2("new name = %S", &newName);
-				LOGTEXT2("tsy name = %S", &tsyName);
-				LOGTEXT2("old name = %S", &infoToMatch.iName);	
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_1, "new name = %S", newName);
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_2, "tsy name = %S", tsyName);
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_3, "old name = %S", infoToMatch.iName);
 				TRAPD(ret,StoreDuplicateNameL(tsyName,infoToMatch.iName,newName));// even if this returns with 
 									//KErrAlreadyExists, carry on searching for another match
 				if (ret!=KErrNone && ret!=KErrAlreadyExists)