diff -r 94dc1107e8b2 -r 40a3f856b14d phoneapp/phoneuistates/inc/cphonesingleandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Thu Jul 15 18:38:16 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Thu Aug 19 09:54:27 2010 +0300
@@ -61,8 +61,14 @@
         /**
         * Handles user selected UI commands.
         * @param aCommand - selected command
-        */    
+        */
         TBool HandleCommandL( TInt aCommand );  
+        
+        /**
+        * This function is called from displaycallsetup and 
+        * the purpose is to do state specific things for callsetup.
+        */
+        IMPORT_C virtual void DoStateSpecificCallSetUpDefinitionsL();
             
     protected:
 
@@ -148,13 +154,7 @@
         * Handles received dialing message from Phone Engine.
         * @param aCallId - call id that received the event
         */ 
-        void HandleDiallingL( TInt aCallId );
-        
-        /**
-        * Sets up all call setup to display.
-        * @param aCallId - call id to set up
-        */ 
-        void DisplayCallSetupL( TInt aCallId );
+        void HandleDialingL( TInt aCallId );
         
         /**
         *  Handles received EPEMessageDisconnecting message from Phone Engine.