--- a/phonebookui/Phonebook2/NamesListExtension/src/cpbk2deletemycardcmd.cpp	Tue Feb 02 10:12:17 2010 +0200
+++ b/phonebookui/Phonebook2/NamesListExtension/src/cpbk2deletemycardcmd.cpp	Fri Feb 19 22:40:27 2010 +0200
@@ -18,6 +18,9 @@
 
 // INCLUDE FILES
 #include "cpbk2deletemycardcmd.h"
+#include <StringLoader.h>
+#include <AknQueryDialog.h>
+#include <Pbk2ExNamesListRes.rsg>
 
 // Phonebook2
 #include <CPbk2ApplicationServices.h>
@@ -89,9 +92,7 @@
         }
 
     delete iContactsArray;
-    delete iRetrieveOperation;
     delete iDeleteOperation;
-    delete iStoreContact;
     Release( iAppServices );
     }
 
@@ -136,7 +137,7 @@
     PBK2_DEBUG_PRINT(PBK2_DEBUG_STRING
         ("CPbk2DeleteMyCardCmd::ExecuteLD(0x%x)"), this);
 
-    IssueRequest( ERetrieving );
+    IssueRequest( EConfirming );
     }
 
 // --------------------------------------------------------------------------
@@ -180,13 +181,6 @@
 
     switch ( iState )
         {
-        case ERetrieving:
-            {
-            __ASSERT_DEBUG( iContactsArray->Count() == 1, 
-                Panic(EPanicInvalidArray ));
-            RetrieveContactL( iContactsArray->At(0) );
-            break;
-            }
         case EConfirming:
             {
             ConfirmDeletionL();
@@ -228,43 +222,6 @@
     }
 
 // --------------------------------------------------------------------------
-// CPbk2DeleteMyCardCmd::VPbkSingleContactOperationComplete
-// --------------------------------------------------------------------------
-//
-void CPbk2DeleteMyCardCmd::VPbkSingleContactOperationComplete(
-    MVPbkContactOperationBase& aOperation,
-    MVPbkStoreContact* aContact )
-    {
-    if ( &aOperation == iRetrieveOperation )
-        {
-        delete iRetrieveOperation;
-        iRetrieveOperation = NULL;
-
-        // We now have a store contact and we can issue a confirmation
-        iStoreContact = aContact;
-        IssueRequest( EConfirming );
-        }
-    }
-
-// --------------------------------------------------------------------------
-// CPbk2DeleteMyCardCmd::VPbkSingleContactOperationFailed
-// --------------------------------------------------------------------------
-//
-void CPbk2DeleteMyCardCmd::VPbkSingleContactOperationFailed(
-    MVPbkContactOperationBase& aOperation,
-    TInt aError )
-    {
-    if ( &aOperation == iRetrieveOperation )
-        {
-        delete iRetrieveOperation;
-        iRetrieveOperation = NULL;
-
-        // We cannot get the contact, so we have to fail
-        ProcessDismissed( aError );
-        }
-    }
-
-// --------------------------------------------------------------------------
 // CPbk2DeleteMyCardCmd::StepComplete
 // --------------------------------------------------------------------------
 //
@@ -330,18 +287,6 @@
     }
 
 // --------------------------------------------------------------------------
-// CPbk2DeleteMyCardCmd::RetrieveContactL
-// --------------------------------------------------------------------------
-//
-void CPbk2DeleteMyCardCmd::RetrieveContactL(
-        const MVPbkContactLink& aContactLink )
-    {
-    // Retrieve the actual store contact from the given link
-    iRetrieveOperation = iAppServices->
-        ContactManager().RetrieveContactL( aContactLink, *this );
-    }
-
-// --------------------------------------------------------------------------
 // CPbk2DeleteMyCardCmd::DeleteContactL
 // --------------------------------------------------------------------------
 //
@@ -378,11 +323,10 @@
 //
 void CPbk2DeleteMyCardCmd::ConfirmDeletionL()
     {
-    CPbk2GeneralConfirmationQuery* query =
-            CPbk2GeneralConfirmationQuery::NewL();
-    
-    if( query->ExecuteLD( *iStoreContact, R_QTN_QUERY_COMMON_CONF_DELETE, 
-            MPbk2ContactNameFormatter::EPreserveAllOriginalSpaces ) )
+    HBufC* prompt = 
+        StringLoader::LoadLC( R_QTN_PHOB_MY_CARD_CLEAR_CONFIRM );
+    CAknQueryDialog* dlg = CAknQueryDialog::NewL();
+    if( dlg->ExecuteLD( R_PBK2_GENERAL_CONFIRMATION_QUERY, *prompt ) )
         {
         // Continue with starting the deletion
         IssueRequest( EStarting );
@@ -391,6 +335,7 @@
         {
         IssueRequest( ECanceling );
         }
+    CleanupStack::PopAndDestroy( prompt );
     }
 
 //  End of File