equal
deleted
inserted
replaced
466 { |
466 { |
467 strings->AppendL( *unnamed ); |
467 strings->AppendL( *unnamed ); |
468 prompt = StringLoader::LoadLC( R_QTN_PHOB_NOTE_UNNAMED_CONTACTS_WERE_MERGED , *strings ); |
468 prompt = StringLoader::LoadLC( R_QTN_PHOB_NOTE_UNNAMED_CONTACTS_WERE_MERGED , *strings ); |
469 } |
469 } |
470 |
470 |
471 CAknNoteDialog* dlg = new( ELeave ) CAknNoteDialog( CAknNoteDialog::ENoTone ); |
471 CAknQueryDialog* dlg = CAknQueryDialog::NewL(); |
472 dlg->PrepareLC( R_PBK2_MERGE_CONTACTS_CONFIRMATION_NOTE ); |
472 dlg->ExecuteLD( R_PBK2_MERGE_CONTACTS_CONFIRMATION_NOTE, *prompt ); |
473 dlg->SetTextL( *prompt ); |
473 |
474 dlg->RunLD(); |
|
475 CleanupStack::PopAndDestroy( prompt ); |
474 CleanupStack::PopAndDestroy( prompt ); |
476 CleanupStack::PopAndDestroy( strings ); |
475 CleanupStack::PopAndDestroy( strings ); |
477 CleanupStack::PopAndDestroy( unnamed ); |
476 CleanupStack::PopAndDestroy( unnamed ); |
478 |
477 |
479 } |
478 } |
588 else |
587 else |
589 { |
588 { |
590 // Show a note |
589 // Show a note |
591 HBufC* prompt = NULL; |
590 HBufC* prompt = NULL; |
592 prompt = StringLoader::LoadLC( R_QTN_PHOB_NOTE_SELECT_2_TO_MERGE ); |
591 prompt = StringLoader::LoadLC( R_QTN_PHOB_NOTE_SELECT_2_TO_MERGE ); |
593 CAknNoteDialog* dlg = new( ELeave ) CAknNoteDialog( CAknNoteDialog::ENoTone ); |
592 CAknQueryDialog* dlg = CAknQueryDialog::NewL(); |
594 dlg->PrepareLC( R_PBK2_MERGE_CONTACTS_ERROR_NOTE ); |
593 dlg->ExecuteLD( R_PBK2_MERGE_CONTACTS_ERROR_NOTE, *prompt ); |
595 dlg->SetTextL( *prompt ); |
|
596 dlg->RunLD(); |
|
597 CleanupStack::PopAndDestroy( prompt ); |
594 CleanupStack::PopAndDestroy( prompt ); |
598 } |
595 } |
599 } |
596 } |
600 } |
597 } |
601 |
598 |