--- a/bearermanagement/mpm/src/mpmserversession.cpp	Thu Jan 07 12:56:54 2010 +0200
+++ b/bearermanagement/mpm/src/mpmserversession.cpp	Mon Jan 18 20:33:49 2010 +0200
@@ -838,31 +838,26 @@
         return EFalse;
         }
 
-    // Read global OCC seamlessness values from CommsDat's DefConn table
+    // Read global cellular data usage values from CommsDat's DefConn table
     genConnSettings = iMyServer.CommsDatAccess()->ReadGenConnSettingsL();
 
-    TUint32 currentSeamlessness( genConnSettings.iSeamlessnessHome );
+    TUint32 currentDataUsage( genConnSettings.iCellularDataUsageHome );
     
     if ( iMyServer.IsVisitorNetwork() )
         {
-        currentSeamlessness = genConnSettings.iSeamlessnessVisitor; 
+        currentDataUsage = genConnSettings.iCellularDataUsageVisitor; 
         }
 
-    if ( currentSeamlessness == ECmSeamlessnessShowprogress ||
-         currentSeamlessness == ECmSeamlessnessFullySeamless )
+    if ( currentDataUsage == ECmCellularDataUsageConfirm )
         {
-        MPMLOGSTRING( "CMPMServerSession::IsConfirmFirstL - False" )
-        isConfirmFirst = EFalse;
+        MPMLOGSTRING( "CMPMServerSession::IsConfirmFirstL - True" )
+        isConfirmFirst = ETrue;
         }
     else 
         {
-        // The currentSeamlessness value ECmSeamlessnessConfirmFirst 
-        // matches with need to display confirmation dialog.
-        // 
-        MPMLOGSTRING(
-            "CMPMServerSession::IsConfirmFirstL - True" )
-        isConfirmFirst = ETrue;
+        MPMLOGSTRING( "CMPMServerSession::IsConfirmFirstL - False" )
         }
+
     return isConfirmFirst;
     }
 
@@ -1106,7 +1101,7 @@
                 //If reading of database failed we do not write back to the database to prevent random values
                 if (errorCode == KErrNone)
                     {
-                    genConnSettings.iSeamlessnessHome = ECmSeamlessnessShowprogress;        
+                    genConnSettings.iCellularDataUsageHome = ECmCellularDataUsageAutomatic;        
                     TRAP_IGNORE(MyServer().CommsDatAccess()->WriteGenConnSettingsL( genConnSettings )); 
                     }
                 } 
@@ -3544,7 +3539,7 @@
 
     MPMLOGSTRING( "CMPMServerSession::IsWlanOnlyL")
 
-    // Read global OCC seamlessness values from CommsDat's DefConn table
+    // Read global cellular data usage values from CommsDat's DefConn table
     genConnSettings = iMyServer.CommsDatAccess()->ReadGenConnSettingsL();
 
     // Find out if new wlans can be prompted
@@ -3560,14 +3555,14 @@
         }
         
     // Find out is only WLAN connection is allowed in current network
-    TUint32 currentSeamlessness( genConnSettings.iSeamlessnessHome );
+    TUint32 currentCellularDataUsage( genConnSettings.iCellularDataUsageHome );
     
     if ( iMyServer.IsVisitorNetwork() )
         {
-        currentSeamlessness = genConnSettings.iSeamlessnessVisitor;  
+        currentCellularDataUsage = genConnSettings.iCellularDataUsageVisitor;  
         }
     
-    if ( currentSeamlessness == ECmSeamlessnessDisabled )
+    if ( currentCellularDataUsage == ECmCellularDataUsageDisabled )
         {
         MPMLOGSTRING( "CMPMServerSession::IsWlanOnlyL: True" )
         return ETrue;