--- a/mmserv/radioutility/radioserver/Session/Src/RadioEventHandler.cpp	Tue Aug 31 15:43:02 2010 +0300
+++ b/mmserv/radioutility/radioserver/Session/Src/RadioEventHandler.cpp	Wed Sep 01 12:23:00 2010 +0100
@@ -22,13 +22,6 @@
 #include    "RadioEventHandler.h"
 #include    "RadioClientServer.h"
 #include    "RadioDebug.h"
-#include    "trace.h"
-
-// This has to be the last include. 
-#ifdef STUB_CONSTELLATION
-#   include "RadioStubManager.h"
-#   define KRadioServerPropertyCategory KStub_KRadioServerPropertyCategory
-#endif //STUB_CONSTELLATION
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -47,7 +40,6 @@
 		iKey(aKey),
 		iObserver(aObserver)
     {
-    FUNC_LOG;
     if ( iKey == ERadioServPsAfSearchEnd )
     	{
 		// This is necessary to make sure AfSearchEnd comes in before FrequencyChanged event.
@@ -64,7 +56,7 @@
 //
 void CRadioEventHandler::ConstructL()
     {
-    FUNC_LOG;
+	RADIO_RDEBUG(_L("[RADIO-SESS] CRadioEventHandler::ConstructL()"));
 	CActiveScheduler::Add(this);
 	User::LeaveIfError( iProperty.Attach(KRadioServerPropertyCategory, iKey) );
 	iProperty.Subscribe(iStatus);
@@ -81,7 +73,6 @@
 	RRadioSession& aSession,
 	TUint aKey )
     {
-    FUNC_LOG;
     CRadioEventHandler* self = new( ELeave ) CRadioEventHandler(aObserver,aSession, aKey);
     CleanupStack::PushL( self );
     self->ConstructL();
@@ -91,7 +82,6 @@
 // Destructor
 CRadioEventHandler::~CRadioEventHandler()
     {
-    FUNC_LOG;
 	if ( IsActive() )
 		{
 		Cancel();
@@ -105,7 +95,6 @@
 //
 void CRadioEventHandler::DoCancel()
     {
-    FUNC_LOG;
 	iProperty.Cancel();
     }
 
@@ -115,7 +104,6 @@
 //
 void CRadioEventHandler::RunL()
     {
-    FUNC_LOG;
     // Subscribe immediately before analyzing the notification to ensure that we
     // don't miss further updates.
 	iProperty.Subscribe(iStatus);
@@ -292,7 +280,7 @@
 			break;
 		default:
 			{
-			INFO("ERROR case default !!!");
+			RADIO_RDEBUG(_L("[RADIO-SESS] CRadioEventHandler::RunL(): ERROR case default !!!"));
 			User::Panic(_L("RadioServer"), KErrGeneral );
 			}
 			break;