equal
deleted
inserted
replaced
447 continue; |
447 continue; |
448 } |
448 } |
449 |
449 |
450 if ( iApplicationId == 0 ) |
450 if ( iApplicationId == 0 ) |
451 { |
451 { |
452 if ( operatorProfile ) |
452 if( operatorUid != KUidNSmlAdapterContact.iUid && |
453 { |
453 operatorUid != 0 ) |
454 if ( id != KUidNSmlAdapterContact.iUid ) |
454 { |
455 { |
455 // Dedicated operator specific adapter in use |
456 User::LeaveIfError(iProviderList.Append(item)); |
456 if ( operatorProfile ) |
457 } |
457 { |
458 } |
458 // Operator profile: show other adapters than platform's |
459 else |
459 // contacts adapter |
460 { |
460 if ( id != KUidNSmlAdapterContact.iUid ) |
461 if ( id != operatorUid && id != profileUid ) |
461 { |
462 { |
462 User::LeaveIfError(iProviderList.Append(item)); |
463 User::LeaveIfError(iProviderList.Append(item)); |
463 } |
464 } |
464 } |
465 } |
465 else |
466 } |
466 { |
|
467 // Non-operator profile: show other adapters than |
|
468 // operator specific contacts adapter & profile adapter |
|
469 if ( id != operatorUid && id != profileUid ) |
|
470 { |
|
471 User::LeaveIfError(iProviderList.Append(item)); |
|
472 } |
|
473 } |
|
474 } |
|
475 else |
|
476 { |
|
477 // Platform's contacts adapter used as operator adapter |
|
478 if( operatorProfile || |
|
479 ( !operatorProfile && id != profileUid ) ) |
|
480 { |
|
481 User::LeaveIfError(iProviderList.Append(item)); |
|
482 } |
|
483 } |
|
484 } |
467 else |
485 else |
468 { |
486 { |
469 User::LeaveIfError(iProviderList.Append(item)); |
487 User::LeaveIfError(iProviderList.Append(item)); |
470 } |
488 } |
471 |
489 |