--- a/connectionmonitoring/connmon/dataconnectionlogger/src/saeobserver.cpp	Thu Jan 07 12:56:54 2010 +0200
+++ b/connectionmonitoring/connmon/dataconnectionlogger/src/saeobserver.cpp	Mon Jan 18 20:33:49 2010 +0200
@@ -261,23 +261,33 @@
         User::WaitForRequest( status );
         LOG( Log::Printf( _L("+ DCL: Async call status==(%d)."), status.Int() ));
 
-        if ( (ntwStatus == EConnMonStatusNotAvailable) || (ntwStatus == EConnMonStatusUnattached) )
-            {
-            LOG( Log::Printf( _L("DCL: GPRS ntwk is UnAttached." )));
-            iNetworkIsUnAttached = ETrue;
-            NotifyPubSub( KPSUidGprsStatus, EPSGprsUnattached );
-            }
-        else if ( ntwStatus == ENtwkStatusNotKnown )
+        switch ( ntwStatus )
             {
-            LOG( Log::Printf( _L("DCL: Async request for GPRS ntwk status failed %d!"),
-                 status.Int() ));
+            case ENtwkStatusNotKnown:
+                LOG( Log::Printf( _L("DCL: Async request for GPRS ntwk status failed %d!"),
+                     status.Int() ));
+                break;
+                
+            case EConnMonStatusNotAvailable:
+            case EConnMonStatusUnattached:
+                LOG( Log::Printf( _L("DCL: GPRS ntwk is UnAttached." )));
+                iNetworkIsUnAttached = ETrue;
+                NotifyPubSub( KPSUidGprsStatus, EPSGprsUnattached );
+                break;
+                
+            case EConnMonStatusActive:
+                LOG( Log::Printf( _L("DCL: GPRS ntwk is Active." )));
+                iNetworkIsUnAttached = EFalse;
+                NotifyPubSub( KPSUidGprsStatus, EPSGprsContextActive );
+                break;
+                
+            case EConnMonStatusAttached:
+            default:
+                LOG( Log::Printf( _L("DCL: GPRS ntwk is Attached." )));
+                iNetworkIsUnAttached = EFalse;
+                NotifyPubSub( KPSUidGprsStatus, EPSGprsAttach );
             }
-        else
-            {
-            LOG( Log::Printf( _L("DCL: GPRS ntwk is Attached." )));
-            iNetworkIsUnAttached = EFalse;
-            NotifyPubSub( KPSUidGprsStatus, EPSGprsAttach );
-            }
+        
         }
     else if ( connType == ESAEWCDMAConnectionType )
         {
@@ -285,23 +295,33 @@
         User::WaitForRequest( status );
         LOG( Log::Printf( _L("+ DCL: Async call status==(%d)."), status.Int() ));
 
-        if ( (ntwStatus == EConnMonStatusNotAvailable) || (ntwStatus == EConnMonStatusUnattached) )
-            {
-            LOG( Log::Printf( _L("DCL: WCDMA ntwk is UnAttached." )));
-            iNetworkIsUnAttached = ETrue;
-            NotifyPubSub( KPSUidWcdmaStatus, EPSWcdmaUnattached );
-            }
-        else if ( ntwStatus == ENtwkStatusNotKnown )
+        switch ( ntwStatus )
             {
-            LOG( Log::Printf( _L("DCL: Async request for WCDMA ntwk status failed %d!"),
-                 status.Int() ));
+            case ENtwkStatusNotKnown:
+                LOG( Log::Printf( _L("DCL: Async request for WCDMA ntwk status failed %d!"),
+                     status.Int() ));
+                break;
+                
+            case EConnMonStatusNotAvailable:
+            case EConnMonStatusUnattached:
+                LOG( Log::Printf( _L("DCL: WCDMA ntwk is UnAttached." )));
+                iNetworkIsUnAttached = ETrue;
+                NotifyPubSub( KPSUidWcdmaStatus, EPSWcdmaUnattached);
+                break;
+                
+            case EConnMonStatusActive:
+                LOG( Log::Printf( _L("DCL: WCDMA ntwk is Active." )));
+                iNetworkIsUnAttached = EFalse;
+                NotifyPubSub( KPSUidWcdmaStatus, EPSWcdmaContextActive );
+                break;
+                
+            case EConnMonStatusAttached:
+            default:
+                LOG( Log::Printf( _L("DCL: WCDMA ntwk is Attached." )));
+                iNetworkIsUnAttached = EFalse;
+                NotifyPubSub( KPSUidWcdmaStatus, EPSWcdmaAttach );
             }
-        else
-            {
-            LOG( Log::Printf( _L("DCL: WCDMA ntwk is Attached." )));
-            iNetworkIsUnAttached = EFalse;
-            NotifyPubSub( KPSUidWcdmaStatus, EPSWcdmaAttach );
-            }
+        
         }
     else
         {