--- a/omads/omadsextensions/adapters/mms/src/mmsadaptermsvapi.cpp	Thu Aug 19 09:41:17 2010 +0300
+++ b/omads/omadsextensions/adapters/mms/src/mmsadaptermsvapi.cpp	Tue Aug 31 15:05:37 2010 +0300
@@ -46,8 +46,7 @@
 //
 CMmsAdapterMsvApi::~CMmsAdapterMsvApi()
     {
-    LOGGER_ENTERFN( "CMmsAdapterMsvApi::~CMmsAdapterMsvApi" );
-    LOGGER_LEAVEFN( "CMmsAdapterMsvApi::~CMmsAdapterMsvApi" );
+    TRACE_FUNC;
     }
        
 // -----------------------------------------------------------------------------
@@ -65,8 +64,6 @@
 //
 void CMmsAdapterMsvApi::ConstructL()
     {
-    LOGGER_ENTERFN( "CMmsAdapterMsvApi::ConstructL" );
-    LOGGER_LEAVEFN( "CMmsAdapterMsvApi::ConstructL" );
     }
 
 
@@ -76,7 +73,7 @@
 //
  TInt CMmsAdapterMsvApi::DeleteUserFolderL( TMsvId aUid )
     {
-    LOGGER_ENTERFN( "MsvApi::DeleteUserFolderL" );
+    TRACE_FUNC_ENTRY;
     
     CMsvEntry* entry = iSession.GetEntryL(aUid);
     CleanupStack::PushL(entry);
@@ -111,7 +108,7 @@
     entry->DeleteL( aUid );
     
     CleanupStack::PopAndDestroy( entry );
-    LOGGER_LEAVEFN( "MsvApi::DeleteUserFolderL" );
+    TRACE_FUNC_EXIT;
     return KErrNone;
     }   
     
@@ -239,8 +236,8 @@
 // -----------------------------------------------------------------------------        
 TInt CMmsAdapterMsvApi::AddUserFolderL( TMsvId& aFolder, const TDesC& aName )
     {
-    LOGGER_ENTERFN( "CMmsAdapterMsvApi::AddUserFolderL" );
-    LOG(aName);
+    TRACE_FUNC_ENTRY;
+    LOGGER_WRITE_1( "aName: %S", &aName );
         
     // Make sure that we are not going to add same folder twise
     TBool found( EFalse );
@@ -276,7 +273,7 @@
     
     aFolder = folderEntry.Id();
     
-    LOGGER_LEAVEFN( "CMmsAdapterMsvApi::AddUserFolderL" );
+    TRACE_FUNC_EXIT;
     return KErrNone;
     }
     
@@ -286,8 +283,8 @@
 // -----------------------------------------------------------------------------    
 TInt CMmsAdapterMsvApi::UpdateUserFolderL( TMsvId aFolder, const TDesC& aName )
     {
-    LOGGER_ENTERFN( "CMmsAdapterMsvApi::UpdateUserFolderL" );
-    LOG( aName );
+    TRACE_FUNC_ENTRY;
+    LOGGER_WRITE_1( "aName: %S", &aName );
     
     CMsvEntry* entry = iSession.GetEntryL( aFolder );
     CleanupStack::PushL( entry );
@@ -298,7 +295,7 @@
         {
         CleanupStack::PopAndDestroy( entry );
         LOGGER_WRITE( "No message folder" );
-        LOGGER_LEAVEFN( "CMmsAdapterMsvApi::UpdateUserFolderL" );
+        TRACE_FUNC_EXIT;
         return KErrNotSupported;
         }
        
@@ -309,7 +306,7 @@
     
     CleanupStack::PopAndDestroy( entry );
     
-    LOGGER_LEAVEFN( "CMmsAdapterMsvApi::UpdateUserFolderL" );
+    TRACE_FUNC_EXIT;
     return KErrNone;
     }