diff -r 2a5d4ab426d3 -r d1c62c765e48 phoneapp/phoneuistates/inc/cphonesingleandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Fri Sep 03 13:33:36 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Fri Sep 17 17:09:12 2010 +0300
@@ -61,8 +61,8 @@
         /**
         * Handles user selected UI commands.
         * @param aCommand - selected command
-        */    
-        TBool HandleCommandL( TInt aCommand );  
+        */
+        TBool HandleCommandL( TInt aCommand );
             
     protected:
 
@@ -96,16 +96,6 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
 
-        virtual void HandleKeyEventL( 
-            const TKeyEvent& aKeyEvent,
-            TEventCode aEventCode );
-        
-        /**
-        * Sets correct in call CBAs.
-        */
-        virtual void UpdateInCallCbaL();
-        
-            
      private:
      
         /**
@@ -142,13 +132,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.
@@ -161,6 +145,11 @@
         */
         void UpdateUiControlsL();
         
+        /**
+         * Updates call bubble and ui commands
+         */
+        void UpdateBubbleAndUICommandsL( TInt aCallId );
+        
     private: //Data
             
         // Store single call id