--- a/bearermanagement/mpm/src/mpmconfirmdlgstarting.cpp Mon May 17 09:55:27 2010 +0300
+++ b/bearermanagement/mpm/src/mpmconfirmdlgstarting.cpp Mon May 24 20:51:35 2010 +0300
@@ -203,11 +203,11 @@
{
MPMLOGSTRING2( "CMPMConfirmDlgStarting<0x%x>::UserSelectedConnectThisTime", iConnId )
- TBool wlanNeeded( EFalse );
- TRAPD( err, wlanNeeded = iIapSelection.StartWlanQueryIfNeededL( iIAP ) )
+ TBool isWlan( EFalse );
+ TRAPD( err, isWlan = iIapSelection.IsIapWlanL( iIAP ) )
if( err == KErrNone )
{
- if( !wlanNeeded )
+ if( !isWlan )
{
if ( iIapState == CMPMIapSelection::EImplicitConnection )
{
@@ -228,9 +228,6 @@
EStarting,
iSession );
- // Complete the ChooseBestIAP message with
- // KErrNone if user selected yes.
- //
MPMLOGSTRING2( "CMPMConfirmDlgStarting<0x%x>::UserSelectedConnectThisTime:\
Complete KErrNone", iConnId )
iIapSelection.ChooseIapComplete( KErrNone, &iPref );
@@ -265,11 +262,11 @@
}
}
- TBool wlanNeeded( EFalse );
- TRAPD( err, wlanNeeded = iIapSelection.StartWlanQueryIfNeededL( iIAP ) )
+ TBool isWlan( EFalse );
+ TRAPD( err, isWlan = iIapSelection.IsIapWlanL( iIAP ) )
if( err == KErrNone )
{
- if( !wlanNeeded )
+ if( !isWlan )
{
if ( iIapState == CMPMIapSelection::EImplicitConnection )
{
@@ -290,8 +287,6 @@
EStarting,
iSession );
- // Complete the ChooseBestIAP message with
- // KErrNone if user selected yes.
//
MPMLOGSTRING2( "CMPMConfirmDlgStarting<0x%x>::UserSelectedConnectAutomatically:\
Complete KErrNone", iConnId )