diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuivoipextension/inc/cphonevcchandler.h
--- a/phoneapp/phoneuivoipextension/inc/cphonevcchandler.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuivoipextension/inc/cphonevcchandler.h	Tue Aug 31 15:14:29 2010 +0300
@@ -68,12 +68,7 @@
             RArray<CTelMenuExtension::TCallInfo>& aArray, 
             TInt aResourceId,
             CEikMenuPane& aMenuPane );
-       
-        /**
-        * CancelHandoverNoteTimer if running
-        */ 
-        void CancelHandoverNoteTimerL();
-        
+         
     protected:
 
         CPhoneVccHandler( 
@@ -90,6 +85,11 @@
         void StartHandoverNoteTimerL();
        
         /**
+        * CancelHandoverNoteTimer if running
+        */ 
+        void CancelHandoverNoteTimerL();
+        
+        /**
         * Callback function for launching Handover wait note
         * This is called when HO note timer timeout is
         * reached
@@ -108,7 +108,7 @@
         */
         void HandoverInProgressNoteL( TInt aCommand );
 
-// From MVccPsPropertyListenerObserver        
+        // From MVccPsPropertyListenerObserver        
         /**
         *  Gets called when PS key is changed
         * @param aKeyId 
@@ -128,7 +128,7 @@
          TInt GetVccServiceIdL();
          
     private: // Data
-		        
+                
         /** 
          * Interface for setting and getting active state
          */
@@ -157,14 +157,8 @@
         // Handover not allowed if multicall
         TBool iNoHoIfMultiCall;
         
-        // Listens for the hand-over status commands
-        CVccUiPsPropertyListener* iPropListener;
-        
-        // Listens for the hand-over request commands
-        CVccUiPsPropertyListener* iPropListenerReq;
-         
-        // Status of Handover failure
-        TBool iHOFailure;
+        // Listens for the hand-over commands
+        CVccUiPsPropertyListener* iPropListener; 
         };
 
 #endif // C_CPHONEVCCHANDLER_H