--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.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"
@@ -22,11 +22,6 @@
 
 // INCLUDE FILES
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmpacketcontextgsmwcdmaextwithdispatcherTraces.h"
-#endif
-
 #include "cmmpacketservicegsmwcdmaext.h"
 
 // ---------------------------------------------------------------------------
@@ -39,7 +34,8 @@
 void CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext(const TDesC& aChannelId,  
         													const TInt aResult ) // Result
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT1_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext. Status: aChannelId=%S, aResult=%d",aChannelId, aResult);
+TFLOGSTRING3( "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext. Status: aChannelId=%S, aResult=%d",
+			&aChannelId, aResult);
 
       if ( KErrNone == aResult )
         {