diff -r 6b5524b4f673 -r 38bb213f60ba phonebookengines/VirtualPhonebook/VPbkSimStore/src/CContactStore.cpp --- a/phonebookengines/VirtualPhonebook/VPbkSimStore/src/CContactStore.cpp Wed Sep 15 11:56:55 2010 +0300 +++ b/phonebookengines/VirtualPhonebook/VPbkSimStore/src/CContactStore.cpp Wed Oct 13 14:15:33 2010 +0300 @@ -48,7 +48,6 @@ #include #include -#include namespace VPbkSimStore { // LOCAL @@ -581,38 +580,17 @@ void CContactStore::StoreReady( MVPbkSimCntStore& /*aStore*/ ) { TVPbkGsmStoreProperty gsmProperties; - TInt res = KErrNone; - if( !FeatureManager::FeatureSupported( KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard ) ) - { - res= iNativeStore->GetGsmStoreProperties( gsmProperties ); - if ( res == KErrNone ) - { - delete iSupportedFieldTypes; - iSupportedFieldTypes = NULL; - TRAP( res, iSupportedFieldTypes = CSupportedFieldTypes::NewL( - iStoreDomain.FieldTypeMappings(), gsmProperties ) ); - iSimStoreCapabilities = gsmProperties.iCaps; - } - } - else // if contact replication from phonebook to usim card. + TInt res = iNativeStore->GetGsmStoreProperties( gsmProperties ); + + if ( res == KErrNone ) { - TInt resGsm = iNativeStore->GetGsmStoreProperties( gsmProperties ); - TVPbkUSimStoreProperty usimProperties; - TInt resUsim = iNativeStore->GetUSimStoreProperties( usimProperties ); - if( resGsm == KErrNone && resUsim == KErrNone ) - { - delete iSupportedFieldTypes; - iSupportedFieldTypes = NULL; - TRAP( res, iSupportedFieldTypes = CSupportedFieldTypes::NewL( - iStoreDomain.FieldTypeMappings(), gsmProperties, usimProperties ) ); - iSimStoreCapabilities = gsmProperties.iCaps; - } - else - { - res = ( resGsm != KErrNone ? resGsm : resUsim ); - } + delete iSupportedFieldTypes; + iSupportedFieldTypes = NULL; + TRAP( res, iSupportedFieldTypes = CSupportedFieldTypes::NewL( + iStoreDomain.FieldTypeMappings(), gsmProperties ) ); + iSimStoreCapabilities = gsmProperties.iCaps; } - + if ( res != KErrNone ) { iStoreState = EStoreNotAvailable;