diff -r 10e98eab6f85 -r a359256acfc6 browserutilities/connectionmanager/Src/InternetConnectionManager.cpp --- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Fri Jul 03 15:54:40 2009 +0100 +++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Thu Aug 27 07:44:59 2009 +0300 @@ -413,8 +413,8 @@ CLOG_WRITE_1( "ConnMan connAllowed: %d", connAllowed ); if( !connAllowed && ( KErrNone == err ) ) { - CLOG_WRITE( "ConnMan SetBearerSet: EApBearerTypeWLAN" ); - overrides->SetBearerSet( EApBearerTypeWLAN ); + CLOG_WRITE( "ConnMan SetBearerSet: ECommDbBearerWLAN" ); + overrides->SetBearerSet( ECommDbBearerWLAN ); } @@ -1391,10 +1391,11 @@ iVpnItem = CVpnApItem::NewLC(); CleanupStack::Pop(); - iVpnEngine->VpnDataL( aAPId, *iVpnItem ); + TRAP_IGNORE(iVpnEngine->VpnDataL( aAPId, *iVpnItem )); // get real WAP id - iVpnItem->ReadUint( EApVpnRealWapID, aAPId ); + if( NULL != iVpnItem ) + iVpnItem->ReadUint( EApVpnRealWapID, aAPId ); } TRAP_IGNORE(iApDataHandler->AccessPointDataL( aAPId, *apItem ));