diff -r a564f66a2339 -r 2bbcc0756c6d omads/omadsappui/AspSyncUtil/src/AspProfileDialog.cpp --- a/omads/omadsappui/AspSyncUtil/src/AspProfileDialog.cpp Wed Apr 14 15:45:46 2010 +0300 +++ b/omads/omadsappui/AspSyncUtil/src/AspProfileDialog.cpp Tue Apr 27 16:23:46 2010 +0300 @@ -964,25 +964,31 @@ continue; } - // In Phonebooks syncronization settings, remove another provider from - // end of settings item list - if (appId == EApplicationIdContact) - { - TInt operatorUid = CAspProfile::OperatorAdapterUidL(); - //if current profile is operator profile, don't display s60 contacts adapter - if (CAspProfile::IsOperatorProfileL(iProfile)) - { - if (operatorUid != providerItem.iDataProviderId) - { - continue; - } - } - //if current profile is not operator profile, don't display operator adapter - else if (operatorUid == providerItem.iDataProviderId) + // In Phonebooks synchronization settings, remove another provider from + // end of settings item list (unless platform's contacts adapter is + // is defined as operator specific adapter and thus there is no dedicated + // operator specific adapter) + if (appId == EApplicationIdContact) + { + TInt operatorUid = CAspProfile::OperatorAdapterUidL(); + if ( operatorUid != KUidNSmlAdapterContact.iUid && + operatorUid != 0 ) { - continue; + // Operator profile: do not display s60 contacts adapter + if (CAspProfile::IsOperatorProfileL(iProfile)) + { + if (operatorUid != providerItem.iDataProviderId) + { + continue; + } + } + // Non-operator profile: Do not display operator adapter + else if (operatorUid == providerItem.iDataProviderId) + { + continue; + } } - } + } HBufC* firstLine = CAspResHandler::GetContentSettingLC( providerItem.iDataProviderId,