equal
deleted
inserted
replaced
911 } |
911 } |
912 |
912 |
913 //Display confirm dialog only if we are moving to cellular IAP |
913 //Display confirm dialog only if we are moving to cellular IAP |
914 if ( MyServer().CommsDatAccess()->CheckWlanL( iMigrateIap ) == ENotWlanIap ) |
914 if ( MyServer().CommsDatAccess()->CheckWlanL( iMigrateIap ) == ENotWlanIap ) |
915 { |
915 { |
916 if ( !( iIapSelection->MpmConnPref().NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) ) |
916 // Check that connection preferences don't deny queries, and |
|
917 // enough time has elapsed from the last query cancelled by the user. |
|
918 if ( !( iIapSelection->MpmConnPref().NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) && |
|
919 !MyServer().IsConnPermQueryTimerOn() ) |
917 { |
920 { |
918 if ( MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming ) |
921 if ( MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming ) |
919 { |
922 { |
920 //International roaming |
923 //International roaming |
921 iConfirmDlgRoaming = CMPMConfirmDlgRoaming::NewL( |
924 iConfirmDlgRoaming = CMPMConfirmDlgRoaming::NewL( |
1013 |
1016 |
1014 if( aError == KErrNone ) |
1017 if( aError == KErrNone ) |
1015 { |
1018 { |
1016 if( aResponse == EMsgQueryCancelled ) |
1019 if( aResponse == EMsgQueryCancelled ) |
1017 { |
1020 { |
|
1021 // User cancelled the connection permission query, |
|
1022 // don't try again until the timer expires. |
|
1023 MyServer().StartConnPermQueryTimer(); |
|
1024 |
1018 if( !aReconnect ) |
1025 if( !aReconnect ) |
1019 { |
1026 { |
1020 // Send a preferred IAP notification |
1027 // Send a preferred IAP notification |
1021 // |
1028 // |
1022 TConnMonIapInfo availableIAPs; |
1029 TConnMonIapInfo availableIAPs; |