--- a/bearermanagement/mpm/src/mpmiapselection.cpp Thu Dec 17 08:55:21 2009 +0200
+++ b/bearermanagement/mpm/src/mpmiapselection.cpp Thu Jan 07 12:56:54 2010 +0200
@@ -438,7 +438,9 @@
if ( ( iChooseIapPref.BearerSet() & TExtendedConnPref::EExtendedConnBearerWLAN ) ||
( iChooseIapPref.BearerSet() == TExtendedConnPref::EExtendedConnBearerUnknown ) )
{
- if ( iNewWlansAllowed )
+ if ( iNewWlansAllowed &&
+ ( iChooseIapPref.BearerSet() ==
+ TExtendedConnPref::EExtendedConnBearerWLAN ) )
{
// User allows only WLAN connections, check WLAN availability.
// A note will be shown if no WLANs are available.
@@ -1347,11 +1349,15 @@
// ConnectioUiUtilities client side has a nonblocking active object
// implementation
//
- CConnectionUiUtilities* connUiUtils = CConnectionUiUtilities::NewL();
+ if ( !( iChooseIapPref.NoteBehaviour() &
+ TExtendedConnPref::ENoteBehaviourConnDisableNotes ) )
+ {
+ CConnectionUiUtilities* connUiUtils = CConnectionUiUtilities::NewL();
- connUiUtils->NoWLANNetworksAvailableNote();
+ connUiUtils->NoWLANNetworksAvailableNote();
- delete connUiUtils;
+ delete connUiUtils;
+ }
}
// -----------------------------------------------------------------------------