--- a/phoneapp/phoneuistates/inc/cphoneconference.h	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconference.h	Wed Sep 01 12:30:10 2010 +0100
@@ -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:
 
@@ -86,6 +92,8 @@
             TEventCode aEventCode );
             
         virtual void HandleNumberEntryClearedL();
+        
+        virtual void OpenMenuBarL();
 
         virtual void HandleIdleL( TInt aCallId );
         
@@ -100,29 +108,48 @@
         virtual void HandleConferenceIdleL();
                         
         virtual void MakeStateTransitionToTwoSinglesL();
-
-        virtual void DisplayCallSetupL( TInt aCallId );
+        
+        virtual TBool IsConferenceBubbleInSelectionMode() const;
         
         virtual void UpdateInCallCbaL();
+        
+        void CloseSelectionListL();
+        
+        virtual void SetHoldFlagL();
+        
+        virtual void DefineAndSetHoldFlagL();
+  
+        virtual void HandleCreateNumberEntryL( 
+			const TKeyEvent& aKeyEvent,
+            TEventCode aEventCode );
 
         void UpdateConferenceSecurityStatusL( TInt aCallId );
-        
+		
+        virtual void DisconnectCallL();
         
      private:
+              
+        void OpenParticipantsListL();
      
         void HandleHeldConferenceL( TInt aCallId );
          
         void HandleConnectedConferenceL();
 
         void ToggleHoldL();
+
+        void OpenDropParticipantSelectionL();
         
         void DropSelectedParticipantL();
         
+        void OpenPrivateSelectionL();
+        
         void PrivateSelectedParticipantL();
         
         void MakeStateTransitionToIdleL();
         
-        void HandleDiallingL( TInt aCallId );
+        void HandleDialingL( TInt aCallId );
+              
+        void CallFromNewCallQueryL();
         
         void HandleWentOneToOneL( TInt aCallId );