--- a/apengine/apsettingshandlerui/src/ApSelPopupList.cpp	Thu Aug 19 10:18:49 2010 +0300
+++ b/apengine/apsettingshandlerui/src/ApSelPopupList.cpp	Tue Aug 31 15:35:44 2010 +0300
@@ -24,9 +24,6 @@
 #include <apsetui.rsg>
 #include <featmgr.h>
 
-#include <csxhelp/cp.hlp.hrh>
-
-
 #include "ApSelectorListBoxModel.h"
 #include "ApSettingsModel.h"
 #include "ApSettingsHandlerUI.hrh"
@@ -243,8 +240,7 @@
 iVpnFilterType( aVpnFilterType ),
 iVariant( aHandler.iExt->iVariant ),
 iIncludeEasyWlan( EFalse ),
-iNoEdit( aNoEdit ),
-iFirstEnter( ETrue )
+iNoEdit( aNoEdit )
     {
     }
 
@@ -282,8 +278,7 @@
 iVariant( aHandler.iExt->iVariant ),
 iIncludeEasyWlan( aIncludeEasyWlan ),
 iInitialised( EFalse ),
-iNoEdit( aNoEdit ),
-iFirstEnter( ETrue )
+iNoEdit( aNoEdit )
     {
     }
 
@@ -318,8 +313,6 @@
     APSETUILOGGER_ENTERFN( EListbox,"SelPopupList::GetHelpContext")
     
     aContext.iMajor = iHandler->iHelpMajor;
-    // help no longer available for user, use dummy ID
-    aContext.iContext = KSET_HLP_AP_SETTING_GPRS;
     
     APSETUILOGGER_LEAVEFN( EListbox,"SelPopupList::GetHelpContext")
     }
@@ -490,14 +483,16 @@
 
     iList->HandleItemAdditionL();
 
+    iList->View()->SetDisableRedraw( EFalse );
+    iList->HandleItemAdditionL();
+
     SetSelectedL();
     iPreferredUid = *iSelected;
     
     SetHighlighted();
 
-    iList->View()->SetDisableRedraw( EFalse );
-    
     SizeChanged();
+    DrawNow();
     
     CheckAndSetDataValidity();
     UpdateCbaL();
@@ -525,8 +520,7 @@
             i = count;
             }
         }
-    
-    iList->SetCurrentItemIndex( idx );
+    iList->SetCurrentItemIndexAndDraw( idx );
     SelectCurrentItemL();
     
     APSETUILOGGER_LEAVEFN( EListbox,"SelPopupList::SetSelectedL")
@@ -839,29 +833,11 @@
                 ( ( iSelMenuType == EApSettingsSelMenuSelectOnly ) ||
                     ( iSelMenuType == EApSettingsSelMenuSelectNormal ) ) )
                 { // process only if command is available...
-                if ( aKeyEvent.iCode == EKeyEnter  &&  iFirstEnter )
-                    {//pressing the enter key at the first time will be changed
-                     //to an up arrow key so the first item in the list will be highlighted
-                    iFirstEnter = EFalse;
-                    iPreferredUid = 0;
-                    SetHighlighted();
-                    TKeyEvent aKeyEventmy = aKeyEvent;
-                    aKeyEventmy.iCode = EKeyUpArrow;
-                    retval = CAknRadioButtonSettingPage::OfferKeyEventL( aKeyEventmy, aType );
-                    }
-                else
-                    {
-                    iFirstEnter = ETrue; //change back to true for the next session
-                    ProcessCommandL( EApSelCmdSelect );
-                    retval = EKeyWasConsumed;
-                    }
+                ProcessCommandL( EApSelCmdSelect );
+                retval = EKeyWasConsumed;
                 }
             else
                 {
-                if ( aKeyEvent.iCode == EKeyUpArrow || aKeyEvent.iCode == EKeyDownArrow )
-                    {//we will have highligt so the following enter key should select the item
-                    iFirstEnter = EFalse;
-                    }
                 retval = CAknRadioButtonSettingPage::OfferKeyEventL(
                                         aKeyEvent, aType );
                 }