--- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp	Wed Sep 15 11:56:55 2010 +0300
+++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp	Wed Oct 13 14:15:33 2010 +0300
@@ -513,10 +513,11 @@
     
         VPbkFieldTypeSelectorFactory::TVPbkContactActionTypeSelector
             contactActionType = iPlugin.Container().SelectedCommunicationMethod();
-      
-        if ( contactActionType
+        
+        if ( !iLongTap && contactActionType
                         == VPbkFieldTypeSelectorFactory::EFindOnMapSelector )
-            {   
+            {  
+            iLongTap = ETrue;    
             DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap );
             }
         else
@@ -575,15 +576,13 @@
         iHasBeenDragged = EFalse;
         }
 
-    if ( executeContactAction && iPlugin.CommandState().IsRunning()  )
+    if ( executeContactAction && iPlugin.CommandState().IsRunning() )
         {
         executeContactAction = EFalse;
         }
 
-    if ( executeContactAction )
+    if (executeContactAction)
         {
-        SetInputBlockerL();
-        
         VPbkFieldTypeSelectorFactory::TVPbkContactActionTypeSelector
             contactActionType = iPlugin.Container().SelectedCommunicationMethod();
         
@@ -596,8 +595,6 @@
         	{
             HandleGenericContactActionL( contactActionType );
             }
-        
-        RemoveInputBlocker();
         }
     }
 
@@ -607,7 +604,14 @@
 //
 void CCCAppCommLauncherContainer::HandleFindOnMapContactActionL()
     {
-    DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap );
+    if ( !iLongTap )
+        {
+        DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap );
+        }
+    else
+        {
+        iLongTap = EFalse;
+        }
     }
 
 // ----------------------------------------------------------------------------
@@ -804,13 +808,6 @@
 void CCCAppCommLauncherContainer::ContactInfoFetchedNotifyL(
     const CCmsContactFieldInfo& aContactFieldInfo)
     {
-    
-    //CloseAll Pending Pbk2Commands initiated by CCA.    
-    if( iPbkCmd )
-        {
-        iPbkCmd->DeleteAllRunningCmd();
-        }
-
     // update buttons
     iModel->UpdateAddressesValidationL( aContactFieldInfo );
     iModel->FillButtonArrayL();
@@ -1090,39 +1087,4 @@
 	{
 	return iModel->MdcaCount();
 	}
-
-//-----------------------------------------------------------------------------
-// CCCAppCommLauncherContainer::SetInputBlockerL()
-//-----------------------------------------------------------------------------
-//
-void CCCAppCommLauncherContainer::SetInputBlockerL()
-     {
-     if (!iInputBlocker)
-         {
-         iInputBlocker = CAknInputBlock::NewCancelHandlerLC( this );
-         CleanupStack::Pop( iInputBlocker );   
-         iInputBlocker->SetCancelDelete( iInputBlocker );
-         }
-     } 
-
-// --------------------------------------------------------------------------
-// CCCAppCommLauncherContainer::RemoveInputBlockerL
-// --------------------------------------------------------------------------
-//
-void CCCAppCommLauncherContainer::RemoveInputBlocker()
-    {
-    if (iInputBlocker)
-        {
-        iInputBlocker->Cancel();
-        }
-    }
-
-// --------------------------------------------------------------------------
-// CCCAppCommLauncherContainer::AknInputBlockCancel
-// --------------------------------------------------------------------------
-//
-void CCCAppCommLauncherContainer::AknInputBlockCancel()
-     {
-     iInputBlocker = NULL;
-     }
 // End of File