--- a/phoneengine/callhandling/src/cpesupplementaryservicesmonitor.cpp	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneengine/callhandling/src/cpesupplementaryservicesmonitor.cpp	Wed Sep 01 12:30:10 2010 +0100
@@ -86,23 +86,18 @@
         aBarringEvent );
      switch( aBarringEvent )
         {       
-        case ECCESsIncomingCallBarred:  /** Incoming call is barred. (DoCoMo) */
-        case ECCESsAnonymousCallBarred: /** Anonymous call barring. */
-        case ECCESsOutgoingCallBarred:  /** Outgoing call barring */
-            iOwner.SendMessage( MEngineMonitor::EPEMessageCallBarred, KPECallIdNotUsed );
-            if ( aBarringEvent == ECCESsOutgoingCallBarred )
-                {
-                iOwner.SendMessage( MEngineMonitor::EPEMessageOutgoingCallBarred, 
-                                    KPECallIdNotUsed );
-                }
+        case ECCESsIncomingCallBarred:	/** Incoming call is barred. (DoCoMo) */
+		case ECCESsAnonymousCallBarred:	/** Anonymous call barring. */
+		case ECCESsOutgoingCallBarred: 	/** Outgoing call barring */
+		    iOwner.SendMessage( MEngineMonitor::EPEMessageCallBarred, KPECallIdNotUsed );
             break;
             
         default:
             break;
         }
     }
-    
-        
+	
+		
 // -----------------------------------------------------------------------------
 // CPESupplementaryServicesMonitor::CLIEventOccurred
 // -----------------------------------------------------------------------------
@@ -113,27 +108,27 @@
  
     switch( aCallLineEvent )
         {
-        case ECCESsTempClirSuppressUnsuccessful:    /** Temporary CLIR suppression was unsuccessful */
-            iOwner.SendMessage( MEngineMonitor::EPEMessageTempClirSuppressUnsuccessful, KPECallIdNotUsed );
-            break;
-            
-        case ECCESsTempClirActivationUnsuccessful:  /** Temporary CLIR activation was unsuccessful*/
+        case ECCESsTempClirSuppressUnsuccessful:	/** Temporary CLIR suppression was unsuccessful */
+        	iOwner.SendMessage( MEngineMonitor::EPEMessageTempClirSuppressUnsuccessful, KPECallIdNotUsed );
+        	break;
+        	
+        case ECCESsTempClirActivationUnsuccessful:	/** Temporary CLIR activation was unsuccessful*/
             iOwner.SendMessage( MEngineMonitor::EPEMessageTempClirActivationUnsuccessful, KPECallIdNotUsed );
             break;
             
         default:
-            break;
+        	break;
         }
 
     }
-                          
+						  
 // -----------------------------------------------------------------------------
 // CPESupplementaryServicesMonitor::CallForwardEventOccurred
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CPESupplementaryServicesMonitor::CallForwardEventOccurred( 
-                        const MCCESsObserver::TCCESsCallForwardEvent aCallForwardEvent,
-                        const TDesC& /*aRemoteAddress*/ )
+						const MCCESsObserver::TCCESsCallForwardEvent aCallForwardEvent,
+						const TDesC& /*aRemoteAddress*/ )
     {  
     TEFLOGSTRING2( 
         KTAMESIN, 
@@ -142,35 +137,35 @@
     switch( aCallForwardEvent )
         {
         case ECCESsIncCallIsForw:   /** Incoming call is forwarded */
-            iOwner.SendMessage( MEngineMonitor::EPEMessageIncCallIsForw, KPECallIdNotUsed );
-            break;
-            
-        case ECCESsIncCallForwToC:  /** Incoming call was forwarded because of user own settings. */
-            iOwner.SendMessage( MEngineMonitor::EPEMessageIncCallForwToC, KPECallIdNotUsed );
-            break;
-            
-        case ECCESsOutCallForwToC:  /** outgoing call was forwarded because of user own settings. */
+        	iOwner.SendMessage( MEngineMonitor::EPEMessageIncCallIsForw, KPECallIdNotUsed );
+        	break;
+        	
+        case ECCESsIncCallForwToC:	/** Incoming call was forwarded because of user own settings. */
+        	iOwner.SendMessage( MEngineMonitor::EPEMessageIncCallForwToC, KPECallIdNotUsed );
+        	break;
+        	
+        case ECCESsOutCallForwToC:	/** outgoing call was forwarded because of user own settings. */
             iOwner.SendMessage( MEngineMonitor::EPEMessageOutCallForwToC, KPECallIdNotUsed );
             break;
         
         case ECCESsForwardUnconditionalModeActive:
-            iOwner.SendMessage( MEngineMonitor::EPEMessageForwardUnconditionalModeActive, KPECallIdNotUsed );
-            break;
-            
+        	iOwner.SendMessage( MEngineMonitor::EPEMessageForwardUnconditionalModeActive, KPECallIdNotUsed );
+        	break;
+        	
         case ECCESsForwardConditionallyModeActive:
-            iOwner.SendMessage( MEngineMonitor::EPEMessageForwardConditionallyModeActive, KPECallIdNotUsed );
-            break;
-            
+        	iOwner.SendMessage( MEngineMonitor::EPEMessageForwardConditionallyModeActive, KPECallIdNotUsed );
+        	break;
+        	
         case ESsCallWaiting:
-            iOwner.SendMessage( MEngineMonitor::EPEMessageCallWaiting, KPECallIdNotUsed );
-            TEFLOGSTRING( KTAINT, "CPESupplementaryServicesMonitor::CallForwardEventOccurred -> ECCESsCallWaiting" );
-            break;
+        	iOwner.SendMessage( MEngineMonitor::EPEMessageCallWaiting, KPECallIdNotUsed );
+        	TEFLOGSTRING( KTAINT, "CPESupplementaryServicesMonitor::CallForwardEventOccurred -> ECCESsCallWaiting" );
+        	break;
             
         default:
             break;        
         }       
     }
-                                  
+								  
 // -----------------------------------------------------------------------------
 // CPESupplementaryServicesMonitor::CallCugEventOccurred
 // -----------------------------------------------------------------------------