diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuistates/inc/cphonegeneralgsmmessageshandler.h
--- a/phoneapp/phoneuistates/inc/cphonegeneralgsmmessageshandler.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonegeneralgsmmessageshandler.h	Tue Aug 31 15:14:29 2010 +0300
@@ -12,12 +12,12 @@
 * Contributors:
 *
 * Description: 
-* 		Class that does processing for Phone Engine messages that are common
-*		for all GSM states. Most of the GSM states are intressed of these 
-*		messages but due to the class architecture they don't have any single
-*		state class to be put into. This class exists to minimize duplicate
-*		code so that not every GSM class need to implement these same handlings
-*		for the same messages.
+*       Class that does processing for Phone Engine messages that are common
+*       for all GSM states. Most of the GSM states are intressed of these 
+*       messages but due to the class architecture they don't have any single
+*       state class to be put into. This class exists to minimize duplicate
+*       code so that not every GSM class need to implement these same handlings
+*       for the same messages.
 *
 */
 
@@ -75,7 +75,7 @@
          
 
     private:
-		
+        
         /**
         * By default EPOC constructor is private.
         */
@@ -85,14 +85,16 @@
             MPhoneState& aActiveState );
 
 
-	private:
-	
+    private:
+    
         /**
         * Show global InfoNote
         * @param aResourceId resource id to be resolved
+        * @param aNotificationDialog ETrue if notification dialog should be used
         */
-		void SendGlobalInfoNoteL( TInt aResourceId );
-	    
+        void SendGlobalInfoNoteL( TInt aResourceId, 
+                TBool aNotificationDialog = EFalse );
+        
         /**
         * Shows divert indication or sets internal divert flag
         * depending in which order we receive Incoming and 
@@ -101,33 +103,30 @@
         void HandleIncomingCallForwardedL();
 
         /**
-        * Shows software version note
-        */
-        void HandleShowVersionL();
-        
-        /**
         * Show global ErrorNote
         * @param aResourceId resource id to be resolved
+        * @param aNotificationDialog ETrue if notification dialog should be used
         */
-        void SendGlobalErrorNoteL( TInt aResourceId );
+        void SendGlobalErrorNoteL( TInt aResourceId,
+                TBool aNotificationDialog = EFalse );
 
 
     private:
 
-		/**
-		* Currently active state.
-		*/    
-		MPhoneStateMachine& iStateMachine;
-		
-		/**
-		* Handle for sending view commands.
-		*/
-		MPhoneViewCommandHandle& iViewCommandHandle;
-		
-		/**
-		* Currently active state object.
-		*/
-		MPhoneState& iActiveState; 
+        /**
+        * Currently active state.
+        */    
+        MPhoneStateMachine& iStateMachine;
+        
+        /**
+        * Handle for sending view commands.
+        */
+        MPhoneViewCommandHandle& iViewCommandHandle;
+        
+        /**
+        * Currently active state object.
+        */
+        MPhoneState& iActiveState; 
            
     };