--- a/uifw/AvKon/src/akndiscreetpopupserverhandler.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/AvKon/src/akndiscreetpopupserverhandler.cpp	Fri Feb 19 23:04:46 2010 +0200
@@ -20,7 +20,7 @@
 #include <avkon.hrh>
 #include "akndiscreetpopupserverhandler.h"
 #include "akndiscreetpopupdata.h"
-
+#include "akntrace.h"
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -57,8 +57,10 @@
 //
 CAknDiscreetPopupServerHandler::~CAknDiscreetPopupServerHandler()
     {
+    _AKNTRACE_FUNC_ENTER;
     iLaunchers.ResetAndDestroy();
     iUiServer.Close();
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -191,7 +193,9 @@
 //
 void CAknDiscreetPopupServerHandler::ConstructL()
     {
+    _AKNTRACE_FUNC_ENTER;
     User::LeaveIfError( iUiServer.Connect() );
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -221,6 +225,7 @@
 //
 CAknDiscreetPopupGlobalLauncher::~CAknDiscreetPopupGlobalLauncher()
     {
+    _AKNTRACE( "[%s][%s] Enter ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
     if ( IsActive() && iHandler )
         {
         // Cancel request using status handle
@@ -229,6 +234,7 @@
         iHandler->UiServer()->DoDiscreetPopupAction( &cancelData );
         }
     Cancel();
+    _AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
     }
 
 
@@ -238,11 +244,14 @@
 //
 void CAknDiscreetPopupGlobalLauncher::LaunchDiscreetPopup()
     {
+    _AKNTRACE( "[%s][%s] Enter ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
     if ( IsActive() )
         {
+        _AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
         return;
         }
     RenewRequest();
+    _AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
     }
 
 
@@ -252,6 +261,8 @@
 //
 void CAknDiscreetPopupGlobalLauncher::RunL()
     {
+    _AKNTRACE( "[%s][%s] Enter,  iStatus : %d", 
+    		"CAknDiscreetPopupGlobalLauncher", __FUNCTION__, iStatus.Int() );
     if ( iStatus.Int() != KRequestPending )
         {
         if( iCommandObserver )
@@ -271,6 +282,7 @@
         {
         RenewRequest();
         }
+    _AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
     }
 
 
@@ -318,6 +330,7 @@
     {
     if ( iHandler )
         {
+        _AKNTRACE( "CAknDiscreetPopupGlobalLauncher::RenewRequest, issue request." );
         iHandler->UiServer()->DoDiscreetPopupAction( PopupData(), &iStatus );
         }
     SetActive();
@@ -345,12 +358,14 @@
         const TUid& aAppUid,
         const TUid& aViewUid )
     {
+    _AKNTRACE( "[%s][%s] Enter ", "CAknDiscreetPopupGlobalParamLauncher", __FUNCTION__ );
     CAknDiscreetPopupGlobalParamLauncher* self = 
         new ( ELeave ) CAknDiscreetPopupGlobalParamLauncher(
                 aHandler, aObserver, aCommandId, aPopupId, aAppUid, aViewUid );
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
+    _AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalParamLauncher", __FUNCTION__ );
     return self;
     }
 
@@ -438,12 +453,14 @@
         const TUid& aAppUid,
         const TUid& aViewUid )
     {
+    _AKNTRACE( "[%s][%s] Enter ", "CAknDiscreetPopupGlobalResourceLauncher", __FUNCTION__ );
     CAknDiscreetPopupGlobalResourceLauncher* self = 
         new ( ELeave ) CAknDiscreetPopupGlobalResourceLauncher(
                 aHandler, aObserver, aCommandId, aPopupId, aAppUid, aViewUid );
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
+    _AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalResourceLauncher", __FUNCTION__ );
     return self;
     }