equal
deleted
inserted
replaced
456 info.iMode = MPsetNetworkSelect::ENetSelectModeManual; |
456 info.iMode = MPsetNetworkSelect::ENetSelectModeManual; |
457 iPhoneSettingsEngine->SelectNetworkL( info ); |
457 iPhoneSettingsEngine->SelectNetworkL( info ); |
458 } |
458 } |
459 else // user selected "Cancel" |
459 else // user selected "Cancel" |
460 { |
460 { |
|
461 //Reset back to previously used network |
|
462 iPhoneSettingsEngine->ResetNetworkSearch(); |
461 //After list has been used, clear it. |
463 //After list has been used, clear it. |
462 PurgeNetworkList(); |
464 PurgeNetworkList(); |
463 if ( iPhoneSettingsEngine->IsCallActive() != |
465 if ( iPhoneSettingsEngine->IsCallActive() != |
464 CPsetSAObserver::EPSetCallActive ) |
466 CPsetSAObserver::EPSetCallActive ) |
465 { |
467 { |
860 |
862 |
861 if ( res ) |
863 if ( res ) |
862 { |
864 { |
863 //not required for network mode UI item. |
865 //not required for network mode UI item. |
864 //other items require calling this method. |
866 //other items require calling this method. |
865 if ( aPage != EGSNetworkModeItemId ) |
867 if (aPage != EGSNetworkModeItemId) |
866 { |
868 { |
867 CreateNetworkSsCallL( currentFeature, aPage ); |
869 CreateNetworkSsCallL(currentFeature, aPage); |
868 } |
870 } |
869 else if ( prevSelection != currentIndex ) |
871 else if (prevSelection != currentIndex) |
870 { |
872 { |
871 // Show the confirmation query. Uses TGSNetworkModeItems. |
873 if ( iPsmActive->Mode() == EPsmsrvModePowerSave ) |
872 Container()->SetCurrentNetworkModeSelectionL( currentFeature ); |
874 { |
873 } |
875 // If PSM is on, block setting: |
874 } |
876 DisplayBlockNoteL(); |
875 CleanupStack::PopAndDestroy( itemArray ); |
877 } |
876 } |
878 else |
877 //We'll update listbox for Network Mode when we're sure that phone is not |
879 { |
|
880 // Show the confirmation query. Uses TGSNetworkModeItems. |
|
881 Container()->SetCurrentNetworkModeSelectionL(currentFeature); |
|
882 } |
|
883 } |
|
884 } |
|
885 CleanupStack::PopAndDestroy(itemArray); |
|
886 } |
|
887 //We'll update listbox for Network Mode when we're sure that phone is not |
878 //in Offline mode |
888 //in Offline mode |
879 if ( aPage != EGSNetworkModeItemId ) |
889 if ( aPage != EGSNetworkModeItemId ) |
880 { |
890 { |
881 UpdateListBoxL( aPage ); |
891 UpdateListBoxL( aPage ); |
882 } |
892 } |