--- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmsecuritymesshandler.cpp	Mon Nov 09 10:36:19 2009 +0000
+++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmsecuritymesshandler.cpp	Thu Jan 14 10:44:58 2010 +0200
@@ -23,9 +23,9 @@
 #include "cmmnetmesshandler.h"
 #include "cmmcallmesshandler.h"
 #include "tsylogger.h" // logging
-#include "osttracedefinitions.h"
+#include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmsecuritymesshandlertraces.h"
+#include "cmmsecuritymesshandlerTraces.h"
 #endif
 
 #include <etelmm.h>
@@ -64,7 +64,6 @@
 const TUint8 KFdnStateMask        = 0x01;
 const TUint8 KServiceActivated    = 0x01;
 const TUint8 KServiceNotActivated = 0x00;
-const TUint8 KFileStatusIndex     = 0x0B;
 const TUint8 KInvalidated         = 0x00;
 const TUint8 KNotInvalidated      = 0x01;
 const TUint8 KInvalidateFlagMask  = 0x01;
@@ -2059,6 +2058,7 @@
 TInt CMmSecurityMessHandler::ProcessUiccMsg(
     TInt aTraId,
     TInt aStatus,
+    TUint8 /*aDetails*/,
     const TDesC8& aFileData )
     {
 TFLOGSTRING("TSY: CMmSecurityMessHandler::ProcessUiccMsg");
@@ -2403,7 +2403,8 @@
             // let's check the current FDN status. 
             // If EFadn is invalidated, FDN is enabled, otherwise FDN
             // is disabled
-            TUint8 invalidationFlag( aFileData[KFileStatusIndex] & KInvalidateFlagMask );
+            TFci fci( aFileData );
+            TUint8 invalidationFlag( fci.GetFileStatus() & KInvalidateFlagMask );
 
             if( ( KInvalidated == invalidationFlag && 
                   RMobilePhone::EFdnSetOn == iFdnSetting ) ||
@@ -2459,7 +2460,8 @@
         if( iMmUiccMessHandler->GetServiceStatus( KIccServiceFdn ) &&
             iMmUiccMessHandler->GetServiceStatus( KIccServiceAdn ) )
             {
-            TUint8 invalidationFlag( aFileData[KFileStatusIndex] & KInvalidateFlagMask );
+            TFci fci( aFileData );
+            TUint8 invalidationFlag( fci.GetFileStatus() & KInvalidateFlagMask );
 
             if( KInvalidated == invalidationFlag )
                 {