diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuistates/inc/cphonesingleandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Tue Aug 31 15:14:29 2010 +0300
@@ -61,14 +61,8 @@
         /**
         * 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:
 
@@ -102,10 +96,9 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
 
-        /**
-        * Opens menu bar.
-        */    
-        virtual void OpenMenuBarL();
+        virtual void HandleKeyEventL( 
+            const TKeyEvent& aKeyEvent,
+            TEventCode aEventCode );
         
         /**
         * Sets correct in call CBAs.
@@ -115,16 +108,16 @@
             
      private:
      
-     	/**
-     	* Unholds the call.
-     	* @param aCallId - call id to unhold
-     	*/
+        /**
+        * Unholds the call.
+        * @param aCallId - call id to unhold
+        */
         void HandleUnholdL( TInt aCallId );
      
-     	/**
-     	* Performs a state transition to Two Singles.
-     	* @param aCallId - call id that got connected
-     	*/
+        /**
+        * Performs a state transition to Two Singles.
+        * @param aCallId - call id that got connected
+        */
         void MakeStateTransitionToTwoSinglesL( TInt aCallId );
         
         /**
@@ -146,21 +139,27 @@
         void HandleConnectedL( TInt aCallId );
         
         /**
-        * Fetches phone number from new call quoery and dials that number.
-        */ 
-        void CallFromNewCallQueryL();
-        
-        /**
         * Handles received dialing message from Phone Engine.
         * @param aCallId - call id that received the event
         */ 
-        void HandleDialingL( TInt aCallId );
+        void HandleDiallingL( TInt aCallId );
+        
+        /**
+        * Sets up all call setup to display.
+        * @param aCallId - call id to set up
+        */ 
+        void DisplayCallSetupL( TInt aCallId );
         
         /**
         *  Handles received EPEMessageDisconnecting message from Phone Engine.
         * @param aCallId: the call id of the call
         */
         void HandleDisconnectingL( TInt aCallId );
+
+        /**
+        *  Handles received EPhoneCmdUpdateUiControls command.
+        */
+        void UpdateUiControlsL();
         
     private: //Data