--- a/bearermanagement/mpm/src/mpmdatausagewatcher.cpp	Thu Aug 19 10:18:49 2010 +0300
+++ b/bearermanagement/mpm/src/mpmdatausagewatcher.cpp	Tue Aug 31 15:35:44 2010 +0300
@@ -118,24 +118,15 @@
         // Get the new Cellular data usage setting value from central repository.
         TInt oldCellularDataUsage = iCellularDataUsage;
 
-        if ( GetCurrentDataUsageValue() == KErrNone // Updates iCellularDataUsage
-             && oldCellularDataUsage != iCellularDataUsage
-             && iServer->RoamingWatcher()->RoamingStatus() != EMPMRoamingStatusUnknown )
+        if ( GetCurrentDataUsageValue() == KErrNone )
             {
-            // Setting changed while cellular is in use
-
-            if ( iCellularDataUsage == ECmCellularDataUsageDisabled )
+            // Stop cellular connections if the setting changes into Disabled.
+            if ( oldCellularDataUsage != ECmCellularDataUsageDisabled &&
+                    iCellularDataUsage == ECmCellularDataUsageDisabled &&
+                    iServer->RoamingWatcher()->RoamingStatus() != EMPMRoamingStatusUnknown )
                 {
-                // Cellular data usage disabled -> disconnect cellular
                 iServer->StopCellularConns();
                 }
-            else if ( iCellularDataUsage == ECmCellularDataUsageConfirm )
-                {
-                // Cellular data usage needs to be confirmed -> disconnect if 
-                // there are only silent cellular connections left.
-                iServer->StopCellularConns( ETrue );
-                }
-
             }
         }