--- a/phonebookui/Phonebook2/UIControls/src/CPbk2NamesListControl.cpp	Wed Sep 15 11:56:55 2010 +0300
+++ b/phonebookui/Phonebook2/UIControls/src/CPbk2NamesListControl.cpp	Wed Oct 13 14:15:33 2010 +0300
@@ -42,8 +42,8 @@
 #include "CPbk2PredictiveSearchFilter.h"
 #include "cpbk2contactviewdoublelistbox.h"
 #include <CPbk2ThumbnailManager.h>
-#include <pbk2commonui.rsg>
-#include <pbk2uicontrols.rsg>
+#include <Pbk2CommonUi.rsg>
+#include <Pbk2UIControls.rsg>
 #include "CPbk2AppUi.h"
 
 // Virtual Phonebook
@@ -331,7 +331,7 @@
        
        /**
         * Call this function to skip the showing of blocking progress note.
-        * When done MassUpdateSkipProgressNote( EFalse ) must be called to reset.
+		* When done MassUpdateSkipProgressNote( EFalse ) must be called to reset.
         */
       void MassUpdateSkipProgressNote( TBool aSkip );       
 
@@ -347,14 +347,14 @@
         static TInt HandleMassUpdateTimerCallBack(TAny* aAny);
 
     private:
-        CEikListBox& iListBox;
+		CEikListBox& iListBox;
         TBool iHandleMassUpdateDetected;
         TTime iHandleMassUpdateFirst;
         TTime iHandleMassUpdatePrev;
         TInt  iHandleMassUpdateCount;
         TBool iHandleMassUpdateSkipDialog;        
         CPeriodic* iHandleMassUpdateTimer;
-        CAknWaitDialog*  iHandleMassUpdateDialog;
+		CAknWaitDialog*  iHandleMassUpdateDialog;
     };
 
 // --------------------------------------------------------------------------
@@ -714,8 +714,8 @@
 //
 TBool CPbk2HandleMassUpdate::MassUpdateDetected()
     {
-    return iHandleMassUpdateDetected;
-    }
+	return iHandleMassUpdateDetected;
+	}
 
 // --------------------------------------------------------------------------
 // CPbk2HandleMassUpdate::MassUpdateSkipProgressNote
@@ -877,8 +877,7 @@
                 iNameFormatter( aNameFormatter ),
                 iStoreProperties( aStoreProperties ),
                 iAllowPointerEvents( ETrue ),
-                iOpeningCca( EFalse ),
-                iMarkingModeOn( EFalse )
+                iOpeningCca( EFalse )
     {
     }
 
@@ -936,7 +935,7 @@
         }
     iObservers.Reset();
     iCommandItems.ResetAndDestroy();
-    delete iCheckMassUpdate;
+	delete iCheckMassUpdate;
     delete iListBoxSelectionObserver;
     delete iStateFactory;
     delete iListBox;
@@ -1112,9 +1111,6 @@
     iListBox->SetObserver( this );
     iListBox->SetScrollEventObserver( this );
     iListBox->SetListBoxObserver(this);
-    
-    iListBox->SetMarkingModeObserver( this );
-    
     iUiExtension->SetContactUiControlUpdate( this );
     // set command item updater
     TAny* ext = iUiExtension->ContactUiControlExtensionExtension(
@@ -1205,6 +1201,9 @@
     PBK2_DEBUG_PRINT(PBK2_DEBUG_STRING("CPbk2NamesListControl::Reset(0x%x) - IN"),
         this );
 
+    // Unmark all contacts and reset the toolbar so that the Call button
+    // won't be dimmed
+    TRAP_IGNORE( ProcessCommandL( EAknUnmarkAll ) );
     // Reset find box
     TRAP_IGNORE( ResetFindL() );
     // Destroy all the filtered views from the stack
@@ -1221,9 +1220,6 @@
     TRAP_IGNORE( iCurrentState->SetFocusedContactIndexL( firstContactIndex ) );
     //scroll listbox into beginning (ignore focus that may be below promotion items)
     iListBox->SetTopItemIndex(firstContactIndex);
-    
-    //cancel the marking mode
-    iListBox->SetMarkingMode( EFalse );
 
     // Switch to the background state. This enables the next state to avtivate fully (ActivateStateL()) once phonebook
     // comes from the background.
@@ -1441,8 +1437,6 @@
 void CPbk2NamesListControl::SizeChanged()
     {
     iCurrentState->SizeChanged();
-    // Reset the popup char flag so that the char will not be shown.
-    iListBox->ResetShowPopupChar();
     }
 
 // --------------------------------------------------------------------------
@@ -1493,7 +1487,7 @@
     {
     if( !iAllowPointerEvents )
         {
-        //Passing event to listbox needed even if iCurrentState would be skipped (fix for ou1cimx1#316139)
+		//Passing event to listbox needed even if iCurrentState would be skipped (fix for ou1cimx1#316139)
         iListBox->HandlePointerEventL( aPointerEvent ); 
         return;
         }
@@ -1691,7 +1685,7 @@
 void CPbk2NamesListControl::ClearMarks()
     {
     iCurrentState->ClearMarks();
-    ClearMarkedContactsInfo();
+	ClearMarkedContactsInfo();
     }
 
 // --------------------------------------------------------------------------
@@ -2095,7 +2089,7 @@
 // --------------------------------------------------------------------------
 //
 void CPbk2NamesListControl::FilteredContactRemovedFromView(
-        MVPbkContactViewBase& /*aView*/ )
+		MVPbkContactViewBase& /*aView*/ )
     {    
     DrawDeferred();
     }
@@ -2253,11 +2247,11 @@
 //
 void CPbk2NamesListControl::DoHandleContactAdditionL( TInt aIndex )
     {
-    //Prevent messing with focus with always-on when Phonebook hidden in
-    //reseted state. Otherwise background-added contacts will change focus.
-    //This would cause Phonebook not to look like freshly started when opened again.
-    //And also make sure foreground-added contact will show the new contact
-    //even though the focus is not seen.
+	//Prevent messing with focus with always-on when Phonebook hidden in
+	//reseted state. Otherwise background-added contacts will change focus.
+	//This would cause Phonebook not to look like freshly started when opened again.
+	//And also make sure foreground-added contact will show the new contact
+	//even though the focus is not seen.
     if( (static_cast<CPbk2AppUi*>(
             CEikonEnv::Static()->AppUi()))->IsForeground() )
         {
@@ -2410,7 +2404,7 @@
     TRAPD( res,
         {
         // This will reset back to base view, however retain original view
-        //when opening CCA
+		//when opening CCA
         if( !iOpeningCca ) 
             {
             iCurrentState->ResetFindL(); 
@@ -2429,18 +2423,13 @@
             {
             if( iCurrentState->NamesListState() == EStateEmpty )
                 {
-                // Trap the function because it may leave.
-                TRAPD( res, SelectAndChangeReadyStateL() );
-                HandleError( res );
+                SelectAndChangeReadyStateL();
                 }
             }
         else
             {              
-            if( !iMarkingModeOn )
-                {
-                Reset();
-                }
-            }
+            Reset();
+            }	
         }
 
     // Do not handle contact addition here (DoHandleContactAdditionL),
@@ -2553,29 +2542,9 @@
     TRAP_IGNORE(iCurrentState->HandleControlEventL( aSearchField, MCoeControlObserver::EEventStateChanged, ETrue));
     }
 
-
-// -----------------------------------------------------------------------------
-// CPbk2NamesListControl::MarkingModeStatusChanged
-// -----------------------------------------------------------------------------
-//
-void CPbk2NamesListControl::MarkingModeStatusChanged( TBool /*aActivated*/ )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CPbk2NamesListControl::ExitMarkingMode
-// Called by avkon, if the return value is ETrue, 
-// the Marking mode will be canceled after any operation, 
-// otherwise the Marking mode keep active.
-// -----------------------------------------------------------------------------
-//
-TBool CPbk2NamesListControl::ExitMarkingMode() const
-    {
-    return ETrue;
-    }
-    
 // --------------------------------------------------------------------------
 // CPbk2NamesListControl::HandleForegroundEventL
+//
 // --------------------------------------------------------------------------
 //
 void CPbk2NamesListControl::HandleForegroundEventL(TBool aForeground)
@@ -2659,9 +2628,9 @@
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CPbk2NamesListControl::SetOpeningCca( TBool aIsOpening )
-    {
-    iOpeningCca = aIsOpening;
-    }
+	{
+	iOpeningCca = aIsOpening;
+	}
 
 // ---------------------------------------------------------------------------
 // CPbk2NamesListControlBgTask::CPbk2NamesListControlBgTask