--- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp	Mon Mar 15 12:39:26 2010 +0200
+++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp	Wed Mar 31 21:13:53 2010 +0300
@@ -286,6 +286,19 @@
     }
 
 // ----------------------------------------------------------------------------
+// CCCAppCommLauncherContainer::HandleResourceChange()
+// ----------------------------------------------------------------------------
+//
+void CCCAppCommLauncherContainer::HandleResourceChange(TInt aType)
+	{
+	if ( aType == KEikDynamicLayoutVariantSwitch )
+		{
+		TRAP_IGNORE( iModel->LoadVoipButtonInfoL() );
+		CCCAppViewPluginAknContainer::HandleResourceChange(aType); 
+		}
+	}
+
+// ----------------------------------------------------------------------------
 // CCCAppCommLauncherContainer::CountComponentControls()
 // ----------------------------------------------------------------------------
 //
@@ -487,16 +500,19 @@
                     *iPlugin.ContactHandler().ContactIdentifierLC(),//contactlinkarray
                     paramFlag, 
                     fullName );
-            
-                if ( contactActionType == VPbkFieldTypeSelectorFactory::EVoiceCallSelector ||
-                    contactActionType == VPbkFieldTypeSelectorFactory::EVideoCallSelector ||
-                    contactActionType == VPbkFieldTypeSelectorFactory::EVOIPCallSelector )
+                   
+                contactorService->ExecuteServiceL( param );   
+                
+                //The Timer can be started after user selected any call item
+                if ( contactorService->IsSelected() && 
+                	(contactActionType == VPbkFieldTypeSelectorFactory::EVoiceCallSelector ||
+                     contactActionType == VPbkFieldTypeSelectorFactory::EVideoCallSelector ||
+                     contactActionType == VPbkFieldTypeSelectorFactory::EVOIPCallSelector) )
                     {
                     iPlugin.StartTimerL();
                     }
-            
-                contactorService->ExecuteServiceL( param );
-    
+                
+                
                 CleanupStack::PopAndDestroy( 1 );// contactlinkarray
                 }
             }
@@ -575,15 +591,17 @@
                     paramFlag,
                     fullName);
             
-                if ( contactActionType == VPbkFieldTypeSelectorFactory::EVoiceCallSelector ||
-                    contactActionType == VPbkFieldTypeSelectorFactory::EVideoCallSelector ||
-                    contactActionType == VPbkFieldTypeSelectorFactory::EVOIPCallSelector )
+                contactorService->ExecuteServiceL(param);
+                
+                //The Timer can be started after user selected any call item
+                if ( contactorService->IsSelected() && 
+                	(contactActionType == VPbkFieldTypeSelectorFactory::EVoiceCallSelector ||
+                     contactActionType == VPbkFieldTypeSelectorFactory::EVideoCallSelector ||
+                     contactActionType == VPbkFieldTypeSelectorFactory::EVOIPCallSelector) )
                     {
                     iPlugin.StartTimerL();
                     }
-            
-                contactorService->ExecuteServiceL(param);
-    
+                
                 CleanupStack::PopAndDestroy(1);// contactlinkarray
         	    }
         	}