--- a/bearermanagement/mpm/src/mpmconfirmdlgstarting.cpp	Tue Aug 31 15:35:44 2010 +0300
+++ b/bearermanagement/mpm/src/mpmconfirmdlgstarting.cpp	Wed Sep 01 12:23:51 2010 +0100
@@ -81,11 +81,9 @@
       iIAP( aIAP ),
       iDialogType( aDialogType ),
       iConfirmDlg( NULL ),
-      iMsgQuery( EMsgQueryCancelled ),
       iPref( aPref ),
       iServer( aServer ),
       iSession ( aSession ),
-      iError( 0 ),
       iIapState( aIapState )
     {
     }
@@ -208,11 +206,11 @@
     {
     MPMLOGSTRING2( "CMPMConfirmDlgStarting<0x%x>::UserSelectedConnectThisTime", iConnId )
     
-    TBool isWlan( EFalse );
-    TRAPD( err, isWlan = iIapSelection.IsIapWlanL( iIAP ) )
+    TBool wlanNeeded( EFalse );
+    TRAPD( err, wlanNeeded = iIapSelection.StartWlanQueryIfNeededL( iIAP ) )
     if( err == KErrNone )
         {
-        if( !isWlan )
+        if( !wlanNeeded )
             {
             if ( iIapState == CMPMIapSelection::EImplicitConnection )
                 {
@@ -233,6 +231,9 @@
                                             EStarting,
                                             iSession );
 
+                // Complete the ChooseBestIAP message with 
+                // KErrNone if user selected yes.
+                // 
                 MPMLOGSTRING2( "CMPMConfirmDlgStarting<0x%x>::UserSelectedConnectThisTime:\
 Complete KErrNone", iConnId )
                 iIapSelection.ChooseIapComplete( KErrNone, &iPref );                        
@@ -267,11 +268,11 @@
             }
         } 
     
-    TBool isWlan( EFalse );
-    TRAPD( err, isWlan = iIapSelection.IsIapWlanL( iIAP ) )
+    TBool wlanNeeded( EFalse );
+    TRAPD( err, wlanNeeded = iIapSelection.StartWlanQueryIfNeededL( iIAP ) )
     if( err == KErrNone )
         {
-        if( !isWlan )
+        if( !wlanNeeded )
             {
             if ( iIapState == CMPMIapSelection::EImplicitConnection )
                 {
@@ -292,6 +293,8 @@
                                             EStarting,
                                             iSession );
 
+                 // Complete the ChooseBestIAP message with 
+                 // KErrNone if user selected yes.
                  // 
                  MPMLOGSTRING2( "CMPMConfirmDlgStarting<0x%x>::UserSelectedConnectAutomatically:\
 Complete KErrNone", iConnId )