962 if (iApplicationId != EApplicationIdSync && iApplicationId != appId) |
962 if (iApplicationId != EApplicationIdSync && iApplicationId != appId) |
963 { |
963 { |
964 continue; |
964 continue; |
965 } |
965 } |
966 |
966 |
967 // In Phonebooks syncronization settings, remove another provider from |
967 // In Phonebooks synchronization settings, remove another provider from |
968 // end of settings item list |
968 // end of settings item list (unless platform's contacts adapter is |
969 if (appId == EApplicationIdContact) |
969 // is defined as operator specific adapter and thus there is no dedicated |
970 { |
970 // operator specific adapter) |
971 TInt operatorUid = CAspProfile::OperatorAdapterUidL(); |
971 if (appId == EApplicationIdContact) |
972 //if current profile is operator profile, don't display s60 contacts adapter |
972 { |
973 if (CAspProfile::IsOperatorProfileL(iProfile)) |
973 TInt operatorUid = CAspProfile::OperatorAdapterUidL(); |
974 { |
974 if ( operatorUid != KUidNSmlAdapterContact.iUid && |
975 if (operatorUid != providerItem.iDataProviderId) |
975 operatorUid != 0 ) |
976 { |
|
977 continue; |
|
978 } |
|
979 } |
|
980 //if current profile is not operator profile, don't display operator adapter |
|
981 else if (operatorUid == providerItem.iDataProviderId) |
|
982 { |
976 { |
983 continue; |
977 // Operator profile: do not display s60 contacts adapter |
|
978 if (CAspProfile::IsOperatorProfileL(iProfile)) |
|
979 { |
|
980 if (operatorUid != providerItem.iDataProviderId) |
|
981 { |
|
982 continue; |
|
983 } |
|
984 } |
|
985 // Non-operator profile: Do not display operator adapter |
|
986 else if (operatorUid == providerItem.iDataProviderId) |
|
987 { |
|
988 continue; |
|
989 } |
984 } |
990 } |
985 } |
991 } |
986 |
992 |
987 HBufC* firstLine = CAspResHandler::GetContentSettingLC( |
993 HBufC* firstLine = CAspResHandler::GetContentSettingLC( |
988 providerItem.iDataProviderId, |
994 providerItem.iDataProviderId, |
989 providerItem.iDisplayName); |
995 providerItem.iDisplayName); |
990 |
996 |