--- a/phoneapp/phoneuistates/inc/cphoneconference.h	Thu Jul 15 18:38:16 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconference.h	Thu Aug 19 09:54:27 2010 +0300
@@ -65,6 +65,12 @@
         virtual void HandleKeyMessageL(
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
+        
+        /**
+        * This function is called from displaycallsetup and 
+        * the purpose is to do state specific things for callsetup.
+        */
+        IMPORT_C virtual void DoStateSpecificCallSetUpDefinitionsL();
             
     protected:
 
@@ -102,8 +108,6 @@
         virtual void HandleConferenceIdleL();
                         
         virtual void MakeStateTransitionToTwoSinglesL();
-
-        virtual void DisplayCallSetupL( TInt aCallId );
         
         virtual TBool IsConferenceBubbleInSelectionMode() const;
         
@@ -143,7 +147,7 @@
         
         void MakeStateTransitionToIdleL();
         
-        void HandleDiallingL( TInt aCallId );
+        void HandleDialingL( TInt aCallId );
               
         void CallFromNewCallQueryL();