vmbx/vmbxengine/src/vmbxpbkstore.cpp
changeset 32 1f002146abb4
parent 31 a2467631ae02
--- a/vmbx/vmbxengine/src/vmbxpbkstore.cpp	Wed Jun 23 18:49:32 2010 +0300
+++ b/vmbx/vmbxengine/src/vmbxpbkstore.cpp	Tue Jul 06 14:53:02 2010 +0300
@@ -178,19 +178,18 @@
             // get als line info
             TVmbxAlsLineType alsLine = VmbxUtilities::AlsLine();
             simEntry->SetVmbxAlsLineType( alsLine );
-            // ALS line on
-            if ( EVmbxAlsLineDefault != alsLine )
+            // ALS line off
+            if ( IsSimFileExisting(EMBDNPhoneBook) && (EVmbxAlsLineDefault == alsLine) )
                 {
-                // ALS line on, only should write to 6f17,
-                // so just check 6f17 file write access
-                iPhoneBookType = EVMBXPhoneBook;
+                // ALS line on and 6f17 exist 
+                // just check 6f17 file write access
+                iPhoneBookType = EMBDNPhoneBook;
                 }
-            // ALS line off
             else
                 {
-                // ALS line on, only should write to 6fc7,
-                //so just check 6fc7 file write access
-                iPhoneBookType = EMBDNPhoneBook;
+                // ALS line on, only should write to 6fc7; ALS off, 6f17 file inexist
+                //  check 6fc7 file write access
+                iPhoneBookType = EVMBXPhoneBook;
                 }
             simEntry->SetVoiceMailboxType( EVmbxVoice );
             simEntry->SetServiceId( KVmbxServiceVoice );
@@ -210,8 +209,8 @@
                     {
                     result = ETrue;
                     }
-                 }
-           }
+                }
+            }
         delete simEntry;
         simEntry = NULL;
         }
@@ -516,7 +515,7 @@
             {
             activeAlsLine = EVmbxAlsLine1;
             }
-         if( !IsActive() && !iWait->IsStarted() )
+        if( !IsActive() && !iWait->IsStarted() )
             {
             result = KErrNone;
             // read vmbx number from 6f17 file