diff -r 94dc1107e8b2 -r 40a3f856b14d phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Thu Jul 15 18:38:16 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Thu Aug 19 09:54:27 2010 +0300
@@ -70,6 +70,12 @@
         IMPORT_C virtual void HandleErrorL( 
             const TPEErrorInfo& aErrorInfo ); 
         
+        /**
+        * This function is called from displaycallsetup and 
+        * the purpose is to do state specific things for callsetup.
+        */
+        IMPORT_C virtual void DoStateSpecificCallSetUpDefinitionsL();
+        
     protected:
 
         /**
@@ -100,7 +106,7 @@
                   
          void MakeStateTransitionToConferenceAndSingleL( TInt aCallId );
          
-         void HandleDiallingL( TInt aCallId );
+         void HandleDialingL( TInt aCallId );
          
          void HandleWentOneToOneL( TInt aCallId );