diff -r 41a7f70b3818 -r 5266b1f337bd phoneapp/phoneuistates/inc/cphoneconferenceandwaitingandcallsetup.h
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaitingandcallsetup.h	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaitingandcallsetup.h	Wed Sep 01 12:30:10 2010 +0100
@@ -64,6 +64,13 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
      
+        /**
+        * HandleError
+        * Implements error handling framework
+        * @param aErrorInfo: the error info
+        */
+        IMPORT_C virtual void HandleErrorL( 
+            const TPEErrorInfo& aErrorInfo ); 
 
     protected:
 
@@ -78,7 +85,9 @@
         /**
         * ConstructL()
         */
-        virtual void ConstructL();   
+        virtual void ConstructL();
+        
+        virtual void OpenMenuBarL();        
 
         virtual void UpdateInCallCbaL();
         
@@ -89,19 +98,19 @@
         
      private:
 
-        void HandleConnectingL( TInt aCallId );
-        
-        void HandleConnectedL( TInt aCallId );
-        
-        void UpdateConnectingCbaL();
-        
+		void HandleConnectingL( TInt aCallId );
+		
+		void HandleConnectedL( TInt aCallId );
+		
+		void UpdateConnectingCbaL();
+		
      private:
          
          /**
          * Status of ConferenceAndWaitingAndCallSetup alerting
          */
          TBool iAlerting;
-        
+		
     };
 
 #endif // CPHONECONFERENCEANDWAITINGANDCALLSETUP_H