Revision: 201017
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 14 May 2010 15:54:13 +0300
changeset 22 093cf0757204
parent 20 8b3129ac4c0f
child 24 32d555d93984
child 29 77618ad58aba
child 33 938269283a16
Revision: 201017 Kit: 201019
accesssec.pro
accesssec_plat/eapaka_db_api/eapaka_db_api.metaxml
accesssec_plat/eapaka_db_api/group/bld.inf
accesssec_plat/eapaka_db_api/inc/EapAkaUiAkaData.h
accesssec_plat/eapaka_db_api/inc/EapAkaUiConnection.h
accesssec_plat/eapaka_db_api/inc/EapAkaUiDataConnection.h
accesssec_plat/eapgtc_db_api/eapgtc_db_api.metaxml
accesssec_plat/eapgtc_db_api/group/bld.inf
accesssec_plat/eapgtc_db_api/inc/EapGtcUiConnection.h
accesssec_plat/eapgtc_db_api/inc/EapGtcUiDataConnection.h
accesssec_plat/eapgtc_db_api/inc/EapGtcUiGtcData.h
accesssec_plat/eapleap_db_api/eapleap_db_api.metaxml
accesssec_plat/eapleap_db_api/group/bld.inf
accesssec_plat/eapleap_db_api/inc/EapLeapUiConnection.h
accesssec_plat/eapleap_db_api/inc/EapLeapUiDataConnection.h
accesssec_plat/eapleap_db_api/inc/EapLeapUiLeapData.h
accesssec_plat/eapmschapv2_db_api/eapmschapv2_db_api.metaxml
accesssec_plat/eapmschapv2_db_api/group/bld.inf
accesssec_plat/eapmschapv2_db_api/inc/EapMsChapV2UiConnection.h
accesssec_plat/eapmschapv2_db_api/inc/EapMsChapV2UiDataConnection.h
accesssec_plat/eapmschapv2_db_api/inc/EapMsChapV2UiMsChapV2Data.h
accesssec_plat/eapsim_db_api/eapsim_db_api.metaxml
accesssec_plat/eapsim_db_api/group/bld.inf
accesssec_plat/eapsim_db_api/inc/EapSimUiConnection.h
accesssec_plat/eapsim_db_api/inc/EapSimUiDataConnection.h
accesssec_plat/eapsim_db_api/inc/EapSimUiSimData.h
accesssec_plat/eaptlspeap_db_api/eaptlspeap_db_api.metaxml
accesssec_plat/eaptlspeap_db_api/group/bld.inf
accesssec_plat/eaptlspeap_db_api/inc/AbsEapTlsPeapUiCertificates.h
accesssec_plat/eaptlspeap_db_api/inc/CertEntry.h
accesssec_plat/eaptlspeap_db_api/inc/EapFastNotifierStruct.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiCertificate.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiCertificates.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiCipherSuite.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiCipherSuites.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiConnection.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiDataConnection.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiEapType.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiEapTypes.h
accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiTlsPeapData.h
accesssec_plat/eaptlspeap_db_api/inc/EapTtlsPapNotifierStruct.h
accesssec_plat/group/bld.inf
accesssec_plat/wapi_db_api/group/bld.inf
accesssec_plat/wapi_db_api/inc/WapiCertificates.h
accesssec_plat/wapi_db_api/wapi_db_api.metaxml
accesssec_plat/wapi_security_settings_ui_api/group/bld.inf
accesssec_plat/wapi_security_settings_ui_api/inc/wapisecuritysettingsui.h
accesssec_plat/wapi_security_settings_ui_api/wapi_security_settings_ui_api.metaxml
accesssec_plat/wep_security_settings_ui_api/group/bld.inf
accesssec_plat/wep_security_settings_ui_api/inc/WEPSecuritySettingsUI.h
accesssec_plat/wep_security_settings_ui_api/wep_security_settings_ui_api.metaxml
accesssec_plat/wi-fi_protected_setup_ui_api/group/bld.inf
accesssec_plat/wi-fi_protected_setup_ui_api/inc/WiFiProtReturn.h
accesssec_plat/wi-fi_protected_setup_ui_api/inc/wifiprotuiclient.h
accesssec_plat/wi-fi_protected_setup_ui_api/inc/wifiprotuiddefs.h
accesssec_plat/wi-fi_protected_setup_ui_api/inc/wifiprotuiinprocess.h
accesssec_plat/wi-fi_protected_setup_ui_api/wi-fi_protected_setup_ui_api.metaxml
accesssec_plat/wlan_eap_settings_ui_api/group/bld.inf
accesssec_plat/wlan_eap_settings_ui_api/inc/EAPPluginConfigurationIf.h
accesssec_plat/wlan_eap_settings_ui_api/inc/EAPPluginConfigurationIf.inl
accesssec_plat/wlan_eap_settings_ui_api/inc/EapAkaUi.h
accesssec_plat/wlan_eap_settings_ui_api/inc/EapGtcUi.h
accesssec_plat/wlan_eap_settings_ui_api/inc/EapLeapUi.h
accesssec_plat/wlan_eap_settings_ui_api/inc/EapMschapv2Ui.h
accesssec_plat/wlan_eap_settings_ui_api/inc/EapPeapUi.h
accesssec_plat/wlan_eap_settings_ui_api/inc/EapSimUi.h
accesssec_plat/wlan_eap_settings_ui_api/inc/EapTlsUi.h
accesssec_plat/wlan_eap_settings_ui_api/inc/EapTtlsUi.h
accesssec_plat/wlan_eap_settings_ui_api/inc/eapfastui.h
accesssec_plat/wlan_eap_settings_ui_api/inc/papui.h
accesssec_plat/wlan_eap_settings_ui_api/wlan_eap_settings_ui_api.metaxml
accesssec_plat/wpa_security_settings_ui_api/group/bld.inf
accesssec_plat/wpa_security_settings_ui_api/inc/WPASecuritySettingsUI.h
accesssec_plat/wpa_security_settings_ui_api/wpa_security_settings_ui_api.metaxml
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/AbsEapTlsPeapUiCertificates.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/CertEntry.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapFastNotifierStruct.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiCertificate.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiCertificates.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiCipherSuite.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiCipherSuites.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiConnection.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiDataConnection.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiEapType.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiEapTypes.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiTlsPeapData.h
eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTtlsPapNotifierStruct.h
eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/plugin/src/EapAka.cpp
eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/plugin/src/EapSim.cpp
eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp
eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapSecurID.cpp
eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeap.cpp
eapol/eapol_framework/eapol_symbian/bwins/eapakau.def
eapol/eapol_framework/eapol_symbian/bwins/eapmschapv2u.def
eapol/eapol_framework/eapol_symbian/bwins/eapprotectedsetupu.def
eapol/eapol_framework/eapol_symbian/bwins/eapsecuridu.def
eapol/eapol_framework/eapol_symbian/bwins/eapsimu.def
eapol/eapol_framework/eapol_symbian/bwins/eaptlspeapu.def
eapol/eapol_framework/eapol_symbian/bwins/eapvpnifu.def
eapol/eapol_framework/eapol_symbian/bwins/wlaneapolifu.def
eapol/eapol_framework/eapol_symbian/eabi/eapakau.def
eapol/eapol_framework/eapol_symbian/eabi/eapmschapv2u.def
eapol/eapol_framework/eapol_symbian/eabi/eapprotectedsetupu.def
eapol/eapol_framework/eapol_symbian/eabi/eapsecuridu.def
eapol/eapol_framework/eapol_symbian/eabi/eapsimu.def
eapol/eapol_framework/eapol_symbian/eabi/eaptlspeapu.def
eapol/eapol_framework/eapol_symbian/eabi/eapvpnifu.def
eapol/eapol_framework/eapol_symbian/eabi/wlaneapolifu.def
eapol/eapol_framework/eapol_symbian/group/eapaka.mmp
eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp
eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp
eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp
eapol/eapol_framework/eapol_symbian/group/eapsim.mmp
eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp
group/bld.inf
layers.sysdef.xml
securitysettings/cpwlansecurityuiplugins/cpwepui/cpwepui.pro
securitysettings/cpwlansecurityuiplugins/cpwepui/inc/cpwepui.h
securitysettings/cpwlansecurityuiplugins/cpwepui/inc/wepkeyvalidator.h
securitysettings/cpwlansecurityuiplugins/cpwepui/inc/wlansecuritycontrolpanelwepdefs.h
securitysettings/cpwlansecurityuiplugins/cpwepui/resources/resource.qrc
securitysettings/cpwlansecurityuiplugins/cpwepui/resources/wlan_en_GB.qm
securitysettings/cpwlansecurityuiplugins/cpwepui/resources/wlan_en_GB.ts
securitysettings/cpwlansecurityuiplugins/cpwepui/rom/cpwepui.iby
securitysettings/cpwlansecurityuiplugins/cpwepui/src/cpwepui.cpp
securitysettings/cpwlansecurityuiplugins/cpwepui/src/wepkeyvalidator.cpp
securitysettings/cpwlansecurityuiplugins/cpwepui/traces/OstTraceDefinitions.h
securitysettings/cpwlansecurityuiplugins/cpwlansecurityuiplugins.pro
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/cpwpa2ui.pro
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/inc/cpwpa2ui.h
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/inc/wpa2keyvalidator.h
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/resources/resource.qrc
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/resources/wlan_en_GB.qm
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/resources/wlan_en_GB.ts
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/rom/cpwpa2ui.iby
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/src/cpwpa2ui.cpp
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/src/wpa2keyvalidator.cpp
securitysettings/cpwlansecurityuiplugins/cpwpa2ui/traces/OstTraceDefinitions.h
securitysettings/cpwlansecurityuiplugins/cpwpacmnui/cpwpacmnui.pro
securitysettings/cpwlansecurityuiplugins/cpwpacmnui/inc/cpwpacmneapui.h
securitysettings/cpwlansecurityuiplugins/cpwpacmnui/inc/cpwpacmnui.h
securitysettings/cpwlansecurityuiplugins/cpwpacmnui/inc/cpwpacmnui_global.h
securitysettings/cpwlansecurityuiplugins/cpwpacmnui/rom/cpwpacmnui.iby
securitysettings/cpwlansecurityuiplugins/cpwpacmnui/src/cpwpacmneapui.cpp
securitysettings/cpwlansecurityuiplugins/cpwpacmnui/src/cpwpacmnui.cpp
securitysettings/cpwlansecurityuiplugins/cpwpacmnui/traces/OstTraceDefinitions.h
securitysettings/cpwlansecurityuiplugins/cpwpaui/cpwpaui.pro
securitysettings/cpwlansecurityuiplugins/cpwpaui/inc/cpwpaui.h
securitysettings/cpwlansecurityuiplugins/cpwpaui/inc/wpakeyvalidator.h
securitysettings/cpwlansecurityuiplugins/cpwpaui/resources/resource.qrc
securitysettings/cpwlansecurityuiplugins/cpwpaui/resources/wlan_en_GB.qm
securitysettings/cpwlansecurityuiplugins/cpwpaui/resources/wlan_en_GB.ts
securitysettings/cpwlansecurityuiplugins/cpwpaui/rom/cpwpaui.iby
securitysettings/cpwlansecurityuiplugins/cpwpaui/src/cpwpaui.cpp
securitysettings/cpwlansecurityuiplugins/cpwpaui/src/wpakeyvalidator.cpp
securitysettings/cpwlansecurityuiplugins/cpwpaui/traces/OstTraceDefinitions.h
securitysettings/inc/cpeapplugininterface.h
securitysettings/inc/eapqtconfiginterface.h
securitysettings/inc/eapqtpluginhandle.h
securitysettings/inc/eapqtplugininfo.h
securitysettings/qtconfigutils/bwins/eapqtconfiginterfaceu.def
securitysettings/qtconfigutils/bwins/eapqtplugininfou.def
securitysettings/qtconfigutils/eabi/eapqtconfiginterfaceu.def
securitysettings/qtconfigutils/eabi/eapqtplugininfou.def
securitysettings/qtconfigutils/eapqtconfiginterface/eapqtconfiginterface.pro
securitysettings/qtconfigutils/eapqtconfiginterface/src/eapqtconfiginterface.cpp
securitysettings/qtconfigutils/eapqtplugininfo/eapqtplugininfo.pro
securitysettings/qtconfigutils/eapqtplugininfo/rom/eapqtplugininfo.iby
securitysettings/qtconfigutils/eapqtplugininfo/src/eapqtpluginhandle.cpp
securitysettings/qtconfigutils/eapqtplugininfo/src/eapqtplugininfo.cpp
securitysettings/qtconfigutils/qtconfigutils.pro
securitysettings/securitysettings.pro
sysdef_1_4_0.dtd
sysdef_1_5_1.dtd
wlansecuritysettings/group/bld.inf
wlansecuritysettings/wapisecuritysettingsui/bwinscw/wapisecuritysettingsuiu.def
wlansecuritysettings/wapisecuritysettingsui/eabi/wapisecuritysettingsuiu.def
wlansecuritysettings/wapisecuritysettingsui/rom/wapisecuritysettingsui.iby
wlansecuritysettings/wapisecuritysettingsui/rom/wapisecuritysettingsuiresources.iby
wlansecuritysettings/wapisecuritysettingsui/stub/group/bld.inf
wlansecuritysettings/wapisecuritysettingsui/stub/group/wapisecuritysettingsstub.mmp
wlansecuritysettings/wapisecuritysettingsui/stub/src/wapisecuritysettingsstub.cpp
wlansecuritysettings/wapisecuritysettingsui/stub/src/wapisecuritysettingsuistub.cpp
wlansecuritysettings/wepsecuritysettingsui/Rom/WEPSecuritySettingsUI.iby
wlansecuritysettings/wepsecuritysettingsui/Rom/WEPSecuritySettingsUIResources.iby
wlansecuritysettings/wepsecuritysettingsui/bwinscw/WEPSecuritySettingsUI_EKA2_ALRu.def
wlansecuritysettings/wepsecuritysettingsui/data/WEPSecuritySettingsUI.rss
wlansecuritysettings/wepsecuritysettingsui/eabi/WEPSecuritySettingsUI_EKA2_ALRu.def
wlansecuritysettings/wepsecuritysettingsui/group/WEPSecuritySettingsUI.mmp
wlansecuritysettings/wepsecuritysettingsui/group/bld.inf
wlansecuritysettings/wepsecuritysettingsui/group/wepsecuritysettingsuistub.mmp
wlansecuritysettings/wepsecuritysettingsui/inc/SecuritySettingsLogger.h
wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsDlg.h
wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsImpl.h
wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsImpl.inl
wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsUI.hrh
wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsUiImpl.h
wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsUiPanic.h
wlansecuritysettings/wepsecuritysettingsui/inc/WepKeyDataTextSettingPage.h
wlansecuritysettings/wepsecuritysettingsui/inc/WepSecuritySettingsDefs.h
wlansecuritysettings/wepsecuritysettingsui/loc/wepsecuritysettingsui.loc
wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettings.cpp
wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsDlg.cpp
wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsImpl.cpp
wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsUI.cpp
wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsUiImpl.cpp
wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsUiPanic.cpp
wlansecuritysettings/wepsecuritysettingsui/src/WepKeyDataTextSettingPage.cpp
wlansecuritysettings/wepsecuritysettingsui/src/wepsecuritysettingsstub.cpp
wlansecuritysettings/wepsecuritysettingsui/src/wepsecuritysettingsuistub.cpp
wlansecuritysettings/wifiprotectedsetup/bwinscw/wifiprotclient_alru.def
wlansecuritysettings/wifiprotectedsetup/bwinscw/wifiprotpluginu.def
wlansecuritysettings/wifiprotectedsetup/data/wifiprotplugin.rss
wlansecuritysettings/wifiprotectedsetup/eabi/wifiprotclient_alru.def
wlansecuritysettings/wifiprotectedsetup/eabi/wifiprotpluginu.def
wlansecuritysettings/wifiprotectedsetup/group/bld.inf
wlansecuritysettings/wifiprotectedsetup/group/wifiprot_icons.mk
wlansecuritysettings/wifiprotectedsetup/group/wifiprotclient.mmp
wlansecuritysettings/wifiprotectedsetup/group/wifiprotclientstub.mmp
wlansecuritysettings/wifiprotectedsetup/group/wifiprotplugin.mmp
wlansecuritysettings/wifiprotectedsetup/group/wifiprotpluginstub.mmp
wlansecuritysettings/wifiprotectedsetup/inc/wifiparams.h
wlansecuritysettings/wifiprotectedsetup/inc/wifiparams.inl
wlansecuritysettings/wifiprotectedsetup/inc/wifiprot.loc
wlansecuritysettings/wifiprotectedsetup/inc/wifiprotactiveresp.h
wlansecuritysettings/wifiprotectedsetup/inc/wifiprotlogger.h
wlansecuritysettings/wifiprotectedsetup/inc/wifiprotsession.h
wlansecuritysettings/wifiprotectedsetup/inc/wifiprotsyncclient.h
wlansecuritysettings/wifiprotectedsetup/inc/wifiprotuiclientimpl.h
wlansecuritysettings/wifiprotectedsetup/loc/wifiprot.loc
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotactiverunner.h
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotactiverunnercallback.h
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotconfirmationnotedlg.h
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotdlgsplugin.h
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotenterpindlg.h
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotinitiateeasysetupdlg.h
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotplugin.h
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotplugin.hrh
wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotselectnetworkdlg.h
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotactiverunner.cpp
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotconfirmationnotedlg.cpp
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotdlgsplugin.cpp
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotenterpindlg.cpp
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotinitiateeasysetupdlg.cpp
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotplugin.cpp
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotpluginstub.cpp
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotselectnetworkdlg.cpp
wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotuiinprocess.cpp
wlansecuritysettings/wifiprotectedsetup/rom/WiFiProt.iby
wlansecuritysettings/wifiprotectedsetup/rom/WiFiProtResources.iby
wlansecuritysettings/wifiprotectedsetup/src/wifiprotactiveresp.cpp
wlansecuritysettings/wifiprotectedsetup/src/wifiprotsession.cpp
wlansecuritysettings/wifiprotectedsetup/src/wifiprotsyncclient.cpp
wlansecuritysettings/wifiprotectedsetup/src/wifiprotuiclient.cpp
wlansecuritysettings/wifiprotectedsetup/src/wifiprotuiclientimpl.cpp
wlansecuritysettings/wifiprotectedsetup/src/wifiprotuiclientstub.cpp
wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/data/EapAkaUi.rss
wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/inc/EapAkaUi.hrh
wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/inc/EapAkaUiSettingArray.h
wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/inc/EapAkaUiView.h
wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/loc/eapakaui.loc
wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUi.cpp
wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUiSettingArray.cpp
wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUiView.cpp
wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/data/EapGtcUi.rss
wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/inc/EapGtcUi.hrh
wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/inc/EapGtcUiSettingArray.h
wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/inc/EapGtcUiView.h
wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/loc/eapgtcui.loc
wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUi.cpp
wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUiSettingArray.cpp
wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUiView.cpp
wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/data/GtcNotifDlgUi.rss
wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/inc/GTCMessageDisplayDialog.h
wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/inc/GTCResponseQueryDialog.h
wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/inc/GtcNotifDlgPlugin.h
wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/loc/gtcnotifdlg.loc
wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/src/GTCMessageDisplayDialog.cpp
wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/src/GTCResponseQueryDialog.cpp
wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/src/GtcNotifDlgPlugin.cpp
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/data/EapMschapv2Ui.rss
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/inc/EapMschapv2Ui.hrh
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/inc/EapMschapv2UiSettingArray.h
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/inc/EapMschapv2UiView.h
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/loc/eapmschapv2ui.loc
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2Ui.cpp
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2UiSettingArray.cpp
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2UiView.cpp
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/data/MsChapv2NotifDlgUi.rss
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/inc/MsChapv2NotifDialog.h
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/inc/MsChapv2NotifDlgPlugin.h
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/inc/MsChapv2NotifDlgPlugin.inl
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/loc/mschapv2notifdlg.loc
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/src/MsChapv2NotifDialog.cpp
wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/src/MsChapv2NotifDlgPlugin.cpp
wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/data/EapPeapUi.rss
wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/inc/EapPeapUi.hrh
wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/inc/EapPeapUiSettingArray.h
wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/inc/EapPeapUiView.h
wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/loc/eappeapui.loc
wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUi.cpp
wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUiSettingArray.cpp
wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUiView.cpp
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/data/102072bb.rss
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/data/EAPPluginConfigRes.rss
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPlugInConfigurationDlg.h
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfig.hrh
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfigUid.h
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfiguration.h
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfigurationModel.h
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfigurationModel.inl
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginInfo.h
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginList.h
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPlugInConfigurationDlg.cpp
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPlugInConfigurationModel.cpp
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPluginConfiguration.cpp
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPluginConfigurationProxy.cpp
wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPluginList.cpp
wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/data/EapSimUi.rss
wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/inc/EapSimUi.hrh
wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/inc/EapSimUiSettingArray.h
wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/inc/EapSimUiView.h
wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/loc/eapsimui.loc
wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUi.cpp
wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUiSettingArray.cpp
wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUiView.cpp
wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/data/EapTlsUi.rss
wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/inc/EapTlsUi.hrh
wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/inc/EapTlsUiSettingArray.h
wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/inc/EapTlsUiView.h
wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/loc/eaptlsui.loc
wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUi.cpp
wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUiSettingArray.cpp
wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUiView.cpp
wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/data/EapTtlsUi.rss
wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/inc/EapTtlsUi.hrh
wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/inc/EapTtlsUiSettingArray.h
wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/inc/EapTtlsUiView.h
wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/loc/eapttlsui.loc
wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUi.cpp
wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUiSettingArray.cpp
wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUiView.cpp
wlansecuritysettings/wlaneapsettingsui/bwinscw/eapfastnotifdlgu.def
wlansecuritysettings/wlaneapsettingsui/bwinscw/gtcnotifdlgu.def
wlansecuritysettings/wlaneapsettingsui/bwinscw/leapnotifdlgu.def
wlansecuritysettings/wlaneapsettingsui/bwinscw/mschapv2notifdlgu.def
wlansecuritysettings/wlaneapsettingsui/bwinscw/papnotifdlgu.def
wlansecuritysettings/wlaneapsettingsui/eabi/eapfastnotifdlgu.def
wlansecuritysettings/wlaneapsettingsui/eabi/gtcnotifdlgu.def
wlansecuritysettings/wlaneapsettingsui/eabi/leapnotifdlgu.def
wlansecuritysettings/wlaneapsettingsui/eabi/mschapv2notifdlgu.def
wlansecuritysettings/wlaneapsettingsui/eabi/papnotifdlgu.def
wlansecuritysettings/wlaneapsettingsui/eapnotifwrapper/data/2000cf2e.rss
wlansecuritysettings/wlaneapsettingsui/eapnotifwrapper/inc/eapnotifierdialoguiddefs.h
wlansecuritysettings/wlaneapsettingsui/eapnotifwrapper/src/eapnotifwrapper.cpp
wlansecuritysettings/wlaneapsettingsui/group/EapAkaUi.mmp
wlansecuritysettings/wlaneapsettingsui/group/EapGtcUi.mmp
wlansecuritysettings/wlaneapsettingsui/group/EapMschapv2Ui.mmp
wlansecuritysettings/wlaneapsettingsui/group/EapPeapUi.mmp
wlansecuritysettings/wlaneapsettingsui/group/EapPluginConfig.mmp
wlansecuritysettings/wlaneapsettingsui/group/EapSimUi.mmp
wlansecuritysettings/wlaneapsettingsui/group/EapTlsUi.mmp
wlansecuritysettings/wlaneapsettingsui/group/EapTtlsUi.mmp
wlansecuritysettings/wlaneapsettingsui/group/GtcNotifDlg.mmp
wlansecuritysettings/wlaneapsettingsui/group/MsChapv2NotifDlg.mmp
wlansecuritysettings/wlaneapsettingsui/group/bld.inf
wlansecuritysettings/wlaneapsettingsui/group/eapnotifwrapper.mmp
wlansecuritysettings/wlaneapsettingsui/group/papnotifdlg.mmp
wlansecuritysettings/wlaneapsettingsui/group/papui.mmp
wlansecuritysettings/wlaneapsettingsui/loc/wlaneapsettingsui.loc
wlansecuritysettings/wlaneapsettingsui/pap/configui/data/papui.rss
wlansecuritysettings/wlaneapsettingsui/pap/configui/inc/papui.hrh
wlansecuritysettings/wlaneapsettingsui/pap/configui/inc/papuipwsettingitem.h
wlansecuritysettings/wlaneapsettingsui/pap/configui/inc/papuisettingarray.h
wlansecuritysettings/wlaneapsettingsui/pap/configui/inc/papuiview.h
wlansecuritysettings/wlaneapsettingsui/pap/configui/loc/papui.loc
wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papui.cpp
wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papuipwsettingitem.cpp
wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papuisettingarray.cpp
wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papuiview.cpp
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/data/papnotifdlgui.rss
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papauthdialog.h
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papchallengemsgdialog.h
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papchallengereplydialog.h
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papnotifdlgplugin.h
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papnotifui.hrh
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/loc/papnotifdlg.loc
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/src/papauthdialog.cpp
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/src/papchallengemsgdialog.cpp
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/src/papchallengereplydialog.cpp
wlansecuritysettings/wlaneapsettingsui/pap/notifierui/src/papnotifdlgplugin.cpp
wlansecuritysettings/wlaneapsettingsui/rom/WlanEapSettingsUi.iby
wlansecuritysettings/wlaneapsettingsui/rom/WlanEapSettingsUiResources.iby
wlansecuritysettings/wpasecuritysettingsui/Rom/WPASecuritySettingsUI.iby
wlansecuritysettings/wpasecuritysettingsui/Rom/WPASecuritySettingsUIResources.iby
wlansecuritysettings/wpasecuritysettingsui/bwinscw/WPASecuritySettingsUI_EKA2_ALRu.def
wlansecuritysettings/wpasecuritysettingsui/data/WPASecuritySettingsUI.rss
wlansecuritysettings/wpasecuritysettingsui/eabi/WPASecuritySettingsUI_EKA2_ALRu.def
wlansecuritysettings/wpasecuritysettingsui/group/WPASecuritySettingsUI.mmp
wlansecuritysettings/wpasecuritysettingsui/group/bld.inf
wlansecuritysettings/wpasecuritysettingsui/group/wpasecuritysettingsuistub.mmp
wlansecuritysettings/wpasecuritysettingsui/inc/SecuritySettingsLogger.h
wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsDefs.h
wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsDlg.h
wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsImpl.h
wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsImpl.inl
wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsUI.hrh
wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsUiImpl.h
wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsUiPanic.h
wlansecuritysettings/wpasecuritysettingsui/loc/wpasecuritysettingsui.loc
wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettings.cpp
wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsDlg.cpp
wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsImpl.cpp
wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsUI.cpp
wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsUiImpl.cpp
wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsUiPanic.cpp
wlansecuritysettings/wpasecuritysettingsui/src/wpasecuritysettingsstub.cpp
wlansecuritysettings/wpasecuritysettingsui/src/wpasecuritysettingsuistub.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/accesssec.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TEMPLATE = subdirs
+
+SUBDIRS  += securitysettings
+
+CONFIG += ordered
--- a/accesssec_plat/eapaka_db_api/eapaka_db_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="6cd349f54718e6297849eee37b905363" dataversion="1.0">
-  <name>EAP-AKA DB API</name>
-  <description>Interface for the EAP-AKA UI to access the settings in the EAP-AKA DBMS database.</description>
-  <type>c++</type>
-  <subsystem>wlaneapol</subsystem>
-  <libs>
-  </libs>
-  <release category="domain"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/accesssec_plat/eapaka_db_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                EAP-AKA DB API
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/EapAkaUiAkaData.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapAkaUiAkaData.h)
-../inc/EapAkaUiDataConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapAkaUiDataConnection.h)
-../inc/EapAkaUiConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapAkaUiConnection.h)
--- a/accesssec_plat/eapaka_db_api/inc/EapAkaUiAkaData.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 9 %
-*/
-
-#ifndef _EAPAKAUIAKADATA_H_
-#define _EAPAKAUIAKADATA_H_
-
-#include <e32std.h>
-#include <e32base.h>
-
-const TInt KMaxLengthOfManualUsername = 255;
-const TInt KMaxLengthOfManualRealm = 255;
-
-class CEapAkaUiAkaData : public CBase
-{
-public:
-
-    CEapAkaUiAkaData();
-
-    ~CEapAkaUiAkaData();
-
-    TDes& GetManualUsername();
-
-    TDes& GetManualRealm();
-
-    TBool * GetUseManualUsername();
-
-    TBool * GetUseManualRealm();
-
-private:
-
-    TBuf<KMaxLengthOfManualUsername> iManualUsername;
-
-    TBuf<KMaxLengthOfManualRealm> iManualRealm;
-
-    TBool iUseManualUsername;
-
-    TBool iUseManualRealm;
-};
-
-#endif
--- a/accesssec_plat/eapaka_db_api/inc/EapAkaUiConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPAKAUICONNECTION_H_
-#define _EAPAKAUICONNECTION_H_
-
-#include <e32std.h>
-#include <e32base.h> 
-#include <d32dbms.h>
-#include <EapType.h>
-
-class CEapAkaUiDataConnection;
-
-class CEapAkaUiConnection : public CBase
-{
-
-public:
-
-    CEapAkaUiConnection(
-        const TIndexType iIndexType,
-        const TInt iIndex,
-        const TInt iTunnelingType);
-
-    ~CEapAkaUiConnection();
-
-    TInt Connect();
-
-    TInt Close();
-
-    CEapAkaUiDataConnection * GetDataConnection();
-
-    TIndexType GetIndexType();
-
-    TInt GetIndex();
-
-    TInt GetTunnelingType();
-
-    TInt GetDatabase(RDbNamedDatabase & aDatabase);
-
-protected:
-
-    // Bearer type
-	TIndexType iIndexType;
-	
-	// Unique index
-	TInt iIndex;
-
-	// Tunneling type
-	TInt iTunnelingType;
-
-    TBool iIsConnected;
-    
-    // database names, handlers etc...
-
-    CEapAkaUiDataConnection * iDataConn;
-
-    RDbNamedDatabase iDbNamedDatabase;
-
-    RDbs iDbs;
-};
-
-
-#endif
--- a/accesssec_plat/eapaka_db_api/inc/EapAkaUiDataConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPAKAUIDATACONNECTION_H_
-#define _EAPAKAUIDATACONNECTION_H_
-
-#include <e32base.h>
-class CEapAkaUiConnection;
-class CEapAkaUiAkaData;
-
-
-class CEapAkaUiDataConnection : public CBase
-{
-
-public:
-
-    CEapAkaUiDataConnection(CEapAkaUiConnection * aUiConn);
-
-    ~CEapAkaUiDataConnection();
-
-    TInt Open();
-
-    TInt GetData(CEapAkaUiAkaData ** aDataPtr);
-
-   	TInt Update();
-
-    TInt Close();
-
-protected:
-
-    TBool iIsOpened;
-
-    CEapAkaUiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;
-
-    RDbView iView;
-
-    CDbColSet* iColSet;
-
-    CEapAkaUiAkaData * iDataPtr;
-
-private:
-
-    void FetchDataL();
-};
-
-
-#endif
--- a/accesssec_plat/eapgtc_db_api/eapgtc_db_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="0f9de3e4ff1f1791db5c97e7e88e10f9" dataversion="1.0">
-  <name>EAP-GTC DB API</name>
-  <description>Interface for the EAP-GTC UI to access the settings in the EAP-GTC DBMS database.</description>
-  <type>c++</type>
-  <subsystem>wlaneapol</subsystem>
-  <libs>
-  </libs>
-  <release category="domain"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/accesssec_plat/eapgtc_db_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                EAP-GTC DB API
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/EapGtcUiConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapGtcUiConnection.h)
-../inc/EapGtcUiGtcData.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapGtcUiGtcData.h)
-../inc/EapGtcUiDataConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapGtcUiDataConnection.h)
--- a/accesssec_plat/eapgtc_db_api/inc/EapGtcUiConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPGTCUICONNECTION_H_
-#define _EAPGTCUICONNECTION_H_
-
-#include <e32std.h>
-#include <e32base.h>
-#include <d32dbms.h>
-#include <EapType.h>
-
-class CEapGtcUiDataConnection;
-
-class CEapGtcUiConnection: public CBase
-{
-
-public:
-
-    CEapGtcUiConnection(
-        const TIndexType iIndexType,
-        const TInt iIndex,
-        const TInt iTunnelingType);
-
-    ~CEapGtcUiConnection();
-
-    TInt Connect();
-
-    TInt Close();
-
-    CEapGtcUiDataConnection * GetDataConnection();
-
-    TIndexType GetIndexType();
-
-    TInt GetIndex();
-
-    TInt GetTunnelingType();
-
-    TInt GetDatabase(RDbNamedDatabase & aDatabase);
-
-protected:
-
-    // Bearer type
-	TIndexType iIndexType;
-	
-	// Unique index
-	TInt iIndex;
-
-	// Tunneling type
-	TInt iTunnelingType;
-
-    TBool iIsConnected;
-    
-    // database names, handlers etc...
-
-    CEapGtcUiDataConnection * iDataConn;
-
-    RDbNamedDatabase iDbNamedDatabase;
-
-    RDbs iDbs;
-};
-
-
-#endif
--- a/accesssec_plat/eapgtc_db_api/inc/EapGtcUiDataConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPGTCUIDATACONNECTION_H_
-#define _EAPGTCUIDATACONNECTION_H_
-
-#include <e32base.h>
-
-class CEapGtcUiConnection;
-class CEapGtcUiGtcData;
-
-
-class CEapGtcUiDataConnection : public CBase
-{
-
-public:
-
-    CEapGtcUiDataConnection(CEapGtcUiConnection * aUiConn);
-
-    ~CEapGtcUiDataConnection();
-
-    TInt Open();
-
-    TInt GetData(CEapGtcUiGtcData ** aDataPtr);
-
-   	TInt Update();
-
-    TInt Close();
-
-protected:
-
-    TBool iIsOpened;
-
-    CEapGtcUiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;
-
-    RDbView iView;
-
-    CDbColSet* iColSet;
-
-    CEapGtcUiGtcData * iDataPtr;
-
-private:
-
-    void FetchDataL();
-};
-
-
-#endif
--- a/accesssec_plat/eapgtc_db_api/inc/EapGtcUiGtcData.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 7.1.2 %
-*/
-
-#ifndef _EAPGTCUIGTCDATA_H_
-#define _EAPGTCUIGTCDATA_H_
-
-#include <e32std.h>
-#include <e32base.h>
-
-const TInt KMaxLengthOfUsername=255;
-
-class CEapGtcUiGtcData : public CBase
-{
-public:
-
-    CEapGtcUiGtcData();
-
-    ~CEapGtcUiGtcData();
-
-    TDes& GetIdentity();
-
-private:
-
-    TBuf<KMaxLengthOfUsername> iIdentity;
-};
-
-#endif
--- a/accesssec_plat/eapleap_db_api/eapleap_db_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="dec4e862d75cbb4110513af05869787b" dataversion="1.0">
-  <name>LEAP DB API</name>
-  <description>Interface for the LEAP UI to access the settings in the LEAP DBMS database</description>
-  <type>c++</type>
-  <subsystem>wlaneapol</subsystem>
-  <libs>
-  </libs>
-  <release category="domain"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/accesssec_plat/eapleap_db_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                EAP-LEAP DB API
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/EapLeapUiDataConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapLeapUiDataConnection.h)
-../inc/EapLeapUiLeapData.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapLeapUiLeapData.h)
-../inc/EapLeapUiConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapLeapUiConnection.h)
--- a/accesssec_plat/eapleap_db_api/inc/EapLeapUiConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPLEAPUICONNECTION_H_
-#define _EAPLEAPUICONNECTION_H_
-
-#include <e32std.h>
-#include <e32base.h>
-#include <d32dbms.h>
-#include <EapType.h>
-
-
-class CEapLeapUiDataConnection;
-
-class CEapLeapUiConnection : public CBase
-{
-
-public:
-
-    CEapLeapUiConnection(
-        const TIndexType iIndexType,
-        const TInt iIndex,
-        const TInt iTunnelingType);
-
-    ~CEapLeapUiConnection();
-
-    TInt Connect();
-
-    TInt Close();
-
-    CEapLeapUiDataConnection * GetDataConnection();
-
-    TIndexType GetIndexType();
-
-    TInt GetIndex();
-
-    TInt GetTunnelingType();
-
-    TInt GetDatabase(RDbNamedDatabase & aDatabase);
-
-protected:
-
-    // Bearer type
-	TIndexType iIndexType;
-	
-	// Unique index
-	TInt iIndex;
-
-	// Tunneling type
-	TInt iTunnelingType;
-	
-    TBool iIsConnected;	
-
-    // database names, handlers etc...
-
-    CEapLeapUiDataConnection * iDataConn;
-
-    RDbNamedDatabase iDbNamedDatabase;
-
-    RDbs iDbs;
-};
-
-
-#endif
--- a/accesssec_plat/eapleap_db_api/inc/EapLeapUiDataConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPLEAPUIDATACONNECTION_H_
-#define _EAPLEAPUIDATACONNECTION_H_
-
-#include <e32base.h>
-
-class CEapLeapUiConnection;
-class CEapLeapUiLeapData;
-
-
-class CEapLeapUiDataConnection : public CBase
-{
-
-public:
-
-    CEapLeapUiDataConnection(CEapLeapUiConnection * aUiConn);
-
-    ~CEapLeapUiDataConnection();
-
-    TInt Open();
-
-    TInt GetData(CEapLeapUiLeapData ** aDataPtr);
-
-   	TInt Update();
-
-    TInt Close();
-
-protected:
-
-    TBool iIsOpened;
-
-    CEapLeapUiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;
-
-    RDbView iView;
-
-    CDbColSet* iColSet;
-
-    CEapLeapUiLeapData * iDataPtr;
-
-private:
-
-    void FetchDataL();
-};
-
-
-#endif
--- a/accesssec_plat/eapleap_db_api/inc/EapLeapUiLeapData.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 9 %
-*/
-
-#ifndef _EAPLEAPUILEAPDATA_H_
-#define _EAPLEAPUILEAPDATA_H_
-
-#include <e32std.h>
-#include <e32base.h>
-
-const TInt KMaxLengthOfUsername=255;
-const TInt KMaxLengthOfPassword=255;
-
-class CEapLeapUiLeapData : public CBase
-{
-public:
-
-    CEapLeapUiLeapData();
-
-    ~CEapLeapUiLeapData();
-
-    TDes& GetUsername();
-
-    TDes& GetPassword();
-
-    TBool * GetPasswordPrompt();
-
-private:
-
-    TBuf<KMaxLengthOfUsername> iUsername;
-
-    TBuf<KMaxLengthOfPassword> iPassword;
-
-    TBool iPasswordPrompt;
-};
-
-#endif
--- a/accesssec_plat/eapmschapv2_db_api/eapmschapv2_db_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="e762a883595f48c7a668d895da133acf" dataversion="1.0">
-  <name>EAP-MSCHAPV2 DB API</name>
-  <description>Interface for the EAP-MSCHAPv2 UI to access the settings in the EAP-MSCHAPv2 DBMS database</description>
-  <type>c++</type>
-  <subsystem>wlaneapol</subsystem>
-  <libs>
-  </libs>
-  <release category="domain"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/accesssec_plat/eapmschapv2_db_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                EAP-MSCHAPV2 DB API
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/EapMsChapV2UiDataConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapMsChapV2UiDataConnection.h)
-../inc/EapMsChapV2UiConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapMsChapV2UiConnection.h)
-../inc/EapMsChapV2UiMsChapV2Data.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapMsChapV2UiMsChapV2Data.h)
--- a/accesssec_plat/eapmschapv2_db_api/inc/EapMsChapV2UiConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 7.1.2 %
-*/
-
-#ifndef _EAPMSCHAPV2UICONNECTION_H_
-#define _EAPMSCHAPV2UICONNECTION_H_
-
-#include <e32std.h>
-#include <e32base.h>
-#include <d32dbms.h>
-#include <EapType.h>
-
-class CEapMsChapV2UiDataConnection;
-
-class CEapMsChapV2UiConnection : public CBase
-{
-
-public:
-
-    CEapMsChapV2UiConnection(
-	    const TIndexType aIndexType,
-	    const TInt aIndex,
-	    const TInt aTunnelingType,
-	    const TInt aEAPType);
-
-    ~CEapMsChapV2UiConnection();
-
-    TInt Connect();
-
-    TInt Close();
-
-    CEapMsChapV2UiDataConnection * GetDataConnection();
-
-    TIndexType GetIndexType();
-
-    TInt GetIndex();
-
-    TInt GetTunnelingType();
-
-    TInt GetDatabase(RDbNamedDatabase & aDatabase);
-    
-    TInt GetBearerEAPType();
-
-protected:
-
-    // Bearer type
-	TIndexType iIndexType;
-	
-	// Unique index
-	TInt iIndex;
-
-	// Tunneling type
-	TInt iTunnelingType;
-
-    TBool iIsConnected;
-    
-    // database names, handlers etc...
-
-    CEapMsChapV2UiDataConnection * iDataConn;
-
-    RDbNamedDatabase iDbNamedDatabase;
-
-    RDbs iDbs;
-    
-    // Holds the bearer EAP type.
-    TInt iEAPType;
-};
-
-
-#endif
-
-// End of file
-
--- a/accesssec_plat/eapmschapv2_db_api/inc/EapMsChapV2UiDataConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPMSCHAPV2UIDATACONNECTION_H_
-#define _EAPMSCHAPV2UIDATACONNECTION_H_
-
-#include <e32base.h>
-
-class CEapMsChapV2UiConnection;
-class CEapMsChapV2UiMsChapV2Data;
-
-
-class CEapMsChapV2UiDataConnection : public CBase
-{
-
-public:
-
-    CEapMsChapV2UiDataConnection(CEapMsChapV2UiConnection * aUiConn);
-
-    ~CEapMsChapV2UiDataConnection();
-
-    TInt Open();
-
-    TInt GetData(CEapMsChapV2UiMsChapV2Data ** aDataPtr);
-
-   	TInt Update();
-
-    TInt Close();
-
-protected:
-
-    TBool iIsOpened;
-
-    CEapMsChapV2UiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;
-
-    RDbView iView;
-
-    CDbColSet* iColSet;
-
-    CEapMsChapV2UiMsChapV2Data * iDataPtr;
-
-private:
-
-    void FetchDataL();
-};
-
-
-#endif
--- a/accesssec_plat/eapmschapv2_db_api/inc/EapMsChapV2UiMsChapV2Data.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 9 %
-*/
-
-#ifndef _EAPMSCHAPV2UIMSCHAPV2DATA_H_
-#define _EAPMSCHAPV2UIMSCHAPV2DATA_H_
-
-#include <e32std.h>
-#include <e32base.h>
-
-const TInt KMaxLengthOfUsername=255;
-const TInt KMaxLengthOfPassword=255;
-
-class CEapMsChapV2UiMsChapV2Data : public CBase
-{
-public:
-
-    CEapMsChapV2UiMsChapV2Data();
-
-    ~CEapMsChapV2UiMsChapV2Data();
-
-    TDes& GetUsername();
-
-    TDes& GetPassword();
-
-    TBool * GetPasswordPrompt();
-
-private:
-
-    TBuf<KMaxLengthOfUsername> iUsername;
-
-    TBuf<KMaxLengthOfPassword> iPassword;
-
-    TBool iPasswordPrompt;
-};
-
-#endif
--- a/accesssec_plat/eapsim_db_api/eapsim_db_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="c69621b32ab685a2316b45e342e7671f" dataversion="1.0">
-  <name>EAP-SIM DB API</name>
-  <description>Interface for the EAP-SIM UI to access the settings in the EAP-SIM DBMS database.</description>
-  <type>c++</type>
-  <subsystem>wlaneapol</subsystem>
-  <libs>
-  </libs>
-  <release category="domain"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/accesssec_plat/eapsim_db_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                EAP-SIM DB API
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/EapSimUiConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapSimUiConnection.h)
-../inc/EapSimUiDataConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapSimUiDataConnection.h)
-../inc/EapSimUiSimData.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapSimUiSimData.h)
--- a/accesssec_plat/eapsim_db_api/inc/EapSimUiConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPSIMUICONNECTION_H_
-#define _EAPSIMUICONNECTION_H_
-
-#include <e32std.h>
-#include <e32base.h>
-#include <d32dbms.h>
-#include <EapType.h>
-
-class CEapSimUiDataConnection;
-
-class CEapSimUiConnection : public CBase
-{
-
-public:
-
-    CEapSimUiConnection(
-        const TIndexType iIndexType,
-        const TInt iIndex,
-        const TInt iTunnelingType);
-
-    ~CEapSimUiConnection();
-
-    TInt Connect();
-
-    TInt Close();
-
-    CEapSimUiDataConnection * GetDataConnection();
-
-    TIndexType GetIndexType();
-
-    TInt GetIndex();
-
-    TInt GetTunnelingType();
-
-    TInt GetDatabase(RDbNamedDatabase & aDatabase);
-
-protected:
-
-    // Bearer type
-	TIndexType iIndexType;
-	
-	// Unique index
-	TInt iIndex;
-
-	// Tunneling type
-	TInt iTunnelingType;
-
-    // database names, handlers etc...
-
-    TBool iIsConnected;
-        
-    CEapSimUiDataConnection * iDataConn;
-
-    RDbNamedDatabase iDbNamedDatabase;
-
-    RDbs iDbs;
-};
-
-
-#endif
--- a/accesssec_plat/eapsim_db_api/inc/EapSimUiDataConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPSIMUIDATACONNECTION_H_
-#define _EAPSIMUIDATACONNECTION_H_
-
-#include <e32base.h>
-
-class CEapSimUiConnection;
-class CEapSimUiSimData;
-
-
-class CEapSimUiDataConnection : public CBase
-{
-
-public:
-
-    CEapSimUiDataConnection(CEapSimUiConnection * aUiConn);
-
-    ~CEapSimUiDataConnection();
-
-    TInt Open();
-
-    TInt GetData(CEapSimUiSimData ** aDataPtr);
-
-   	TInt Update();
-
-    TInt Close();
-
-protected:
-
-    TBool iIsOpened;
-
-    CEapSimUiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;
-
-    RDbView iView;
-
-    CDbColSet* iColSet;
-
-    CEapSimUiSimData * iDataPtr;
-
-private:
-
-    void FetchDataL();
-};
-
-
-#endif
--- a/accesssec_plat/eapsim_db_api/inc/EapSimUiSimData.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 9 %
-*/
-
-#ifndef _EAPSIMUISIMDATA_H_
-#define _EAPSIMUISIMDATA_H_
-
-#include <e32std.h>
-#include <e32base.h>
-
-const TInt KMaxLengthOfManualUsername = 255;
-const TInt KMaxLengthOfManualRealm = 255;
-
-class CEapSimUiSimData : public CBase
-{
-public:
-
-    CEapSimUiSimData();
-
-    ~CEapSimUiSimData();
-
-    TDes& GetManualUsername();
-
-    TDes& GetManualRealm();
-
-    TBool * GetUseManualUsername();
-
-    TBool * GetUseManualRealm();
-
-private:
-
-    TBuf<KMaxLengthOfManualUsername> iManualUsername;
-
-    TBuf<KMaxLengthOfManualRealm> iManualRealm;
-
-    TBool iUseManualUsername;
-
-    TBool iUseManualRealm;
-};
-
-#endif
--- a/accesssec_plat/eaptlspeap_db_api/eaptlspeap_db_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="24ee688fb3192d040cddb9a8e6dbdce0" dataversion="1.0">
-  <name>EAP-TLS-PEAP DB API</name>
-  <description>Interface for the UI to access the settings in the TLS-based EAP method DBMS databases</description>
-  <type>c++</type>
-  <subsystem>wlaneapol</subsystem>
-  <libs>
-  </libs>
-  <release category="domain"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/accesssec_plat/eaptlspeap_db_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                EAP-TLS-PEAP DB API
-*
-*/
-
-/*
-* %version: tr1cfwln#7.1.2 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/CertEntry.h     MW_LAYER_PLATFORM_EXPORT_PATH(CertEntry.h)
-../inc/AbsEapTlsPeapUiCertificates.h     MW_LAYER_PLATFORM_EXPORT_PATH(AbsEapTlsPeapUiCertificates.h)
-../inc/EapTlsPeapUiCipherSuite.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiCipherSuite.h)
-../inc/EapTlsPeapUiEapType.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiEapType.h)
-../inc/EapTlsPeapUiConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiConnection.h)
-../inc/EapTlsPeapUiCertificate.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiCertificate.h)
-../inc/EapTlsPeapUiCipherSuites.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiCipherSuites.h)
-../inc/EapTlsPeapUiTlsPeapData.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiTlsPeapData.h)
-../inc/EapTlsPeapUiEapTypes.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiEapTypes.h)
-../inc/EapTlsPeapUiDataConnection.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiDataConnection.h)
-../inc/EapTlsPeapUiCertificates.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsPeapUiCertificates.h)
-../inc/EapFastNotifierStruct.h    MW_LAYER_PLATFORM_EXPORT_PATH(EapFastNotifierStruct.h)
-../inc/EapTtlsPapNotifierStruct.h    MW_LAYER_PLATFORM_EXPORT_PATH(EapTtlsPapNotifierStruct.h)
--- a/accesssec_plat/eaptlspeap_db_api/inc/AbsEapTlsPeapUiCertificates.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _ABSEAPTLSPEAPUICERTIFICATES_H_
-#define _ABSEAPTLSPEAPUICERTIFICATES_H_
-
-// INCLUDES
-
-// CLASS DECLARATION
-/**
-* Class for 
-*/
-class MEapTlsPeapUiCertificates
-{
-public:
-	/**
-	* 
-	*/
-	virtual void CompleteReadCertificates(const TInt aResult) = 0;	
-};
-
-#endif // _ABSEAPTLSPEAPUICERTIFICATES_H_
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/CertEntry.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 8.1.2 %
-*/
-
-#ifndef _SCERTENTRY_H_
-#define _SCERTENTRY_H_
-
-
-#include <unifiedcertstore.h>
-#include <cctcertinfo.h>
-
-/* This is the maximum length of a certificate primary/secondary name we are interested in. */
-const TUint32 KMaxNameLength = 64;
-
-struct SCertEntry
-{
-	TCertLabel iLabel;	// This holds only the certificate label.
-	TKeyIdentifier iSubjectKeyId;
-	TBuf<KMaxNameLength> iPrimaryName; // Primary name of the certificate if any.
-	TBuf<KMaxNameLength> iSecondaryName; // Secondary name of the certificate if any.
-};
-
-#endif // _SCERTENTRY_H_
-
-// End of file
-
-
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapFastNotifierStruct.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 7.1.2 %
-*/
-
-#ifndef EAPFASTNOTIFIERSTRUCT_H
-#define EAPFASTNOTIFIERSTRUCT_H
-
-const TUid KEapFastNotifierUid = {0x2000F8DF};
-
-const TUint KMaxEapFastNotifierBufLength = 255;
-
-enum EEapFastNotifierUiItem
-{
-	EEapFastNotifierPacStorePwQuery,         /* 0 */
-	EEapFastNotifierWrongPacStorePwNote,     /* 1 */
-	EEapFastNotifierAuthProvWaitNote,        /* 2 */
-	EEapFastNotifierAuthProvWaitNoteEnd,     /* 3 */
-	EEapFastNotifierUnauthProvWaitNote,      /* 4 */
-	EEapFastNotifierUnauthProvWaitNoteEnd,   /* 5 */
-	EEapFastNotifierInstallPacConfirmQuery,	 /* 6 */
-	EEapFastNotifierProvSuccessNote,         /* 7 */
-	EEapFastNotifierProvNotSuccessNote,      /* 8 */
-	EEapFastNotifierPacFilePwQuery,          /* 9 */
-	EEapFastNotifierWrongPacFilePwNote,      /* 10 */
-	EEapFastNotifierCreateMasterkeyQuery,    /* 11 */
-	EEapFastNotifierUiItemsNumber            /* 12 */ // keep always as last element
-};
-
-enum EEapFastNotifierUserAction
-{
-	EEapFastNotifierUserActionOk,
-	EEapFastNotifierUserActionCancel
-};
-
-struct TEapFastNotifierStruct
-{
-	EEapFastNotifierUiItem iEapFastNotifierUiItem;
-	TBuf<KMaxEapFastNotifierBufLength> iEapFastNotifierBuffer;
-	EEapFastNotifierUserAction iEapFastNotifierUserAction;
-};
-
-#endif // EAPFASTNOTIFIERSTRUCT_H
-
-// End of File
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiCertificate.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUICERTIFICATE_H_
-#define _EAPTLSPEAPUICERTIFICATE_H_
-
-#include <e32std.h>
-#include <CertEntry.h>
-
-class TEapTlsPeapUiCertificate
-{
-public:
-	SCertEntry iCertEntry;
-	TBool iIsEnabled;		
-};
-
-#endif // _EAPTLSPEAPUICERTIFICATE_H_
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiCertificates.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 7.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUICERTIFICATES_H_
-#define _EAPTLSPEAPUICERTIFICATES_H_
-
-#include <CertEntry.h>
-#include <e32base.h>
-
-class CEapTlsPeapUiConnection;
-class TEapTlsPeapUiCertificate;
-class CEapTlsPeapCertFetcher;
-class MEapTlsPeapUiCertificates;
-
-class CEapTlsPeapUiCertificates : public CBase
-{
-
-public:
-
-    CEapTlsPeapUiCertificates(CEapTlsPeapUiConnection * const aUiConn, MEapTlsPeapUiCertificates * const aParent);
-
-    ~CEapTlsPeapUiCertificates();
-
-    TInt Open();
-
-	TInt GetCertificates(CArrayFixFlat<TEapTlsPeapUiCertificate> ** aUserCerts,
-						 CArrayFixFlat<TEapTlsPeapUiCertificate> ** aCACerts);
-    
-    TInt Update();
-
-    TInt Close();
-    
-    void CompleteReadCertificatesL(
-		const RArray<SCertEntry>& aUserCerts, 
-		const RArray<SCertEntry>& aCACerts);
-
-
-private:
-
-    TBool iIsOpened;
-
-    CEapTlsPeapUiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;
-
-    CArrayFixFlat<TEapTlsPeapUiCertificate> * iUserCerts;
-
-    CArrayFixFlat<TEapTlsPeapUiCertificate> * iCACerts;
-
-    TRequestStatus iStatus;
-	
-	CEapTlsPeapCertFetcher* iCertFetcher;
-	
-	MEapTlsPeapUiCertificates* iParent;
-	
-private:
-
-	void FetchDataL(
-		const TDesC& aTableName,
-		const RArray<SCertEntry>& aAvailableCerts,
-		CArrayFixFlat<TEapTlsPeapUiCertificate> * const aArray);    
-    
-    void UpdateL();
-};
-
-#endif // _EAPTLSPEAPUICERTIFICATES_H_
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiCipherSuite.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUICIPHERSUITE_H_
-#define _EAPTLSPEAPUICIPHERSUITE_H_
-
-#include <e32std.h>
-
-class TEapTlsPeapUiCipherSuite
-{
-public:
-
-    TBool                           iIsEnabled;        
-    TUint							iCipherSuite;
-};
-
-#endif //_EAPTLSPEAPUICIPHERSUITE_H_
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiCipherSuites.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 7.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUICIPHERSUITES_H_
-#define _EAPTLSPEAPUICIPHERSUITES_H_
-
-#include <e32base.h>
-
-class CEapTlsPeapUiConnection;
-class TEapTlsPeapUiCipherSuite;
-
-
-class CEapTlsPeapUiCipherSuites : public CBase
-{
-
-public:
-
-    CEapTlsPeapUiCipherSuites(CEapTlsPeapUiConnection * const aUiConn);
-
-    ~CEapTlsPeapUiCipherSuites();
-
-    TInt Open();
-
-    TInt GetCipherSuites(CArrayFixFlat<TEapTlsPeapUiCipherSuite> ** aDataPtr);
-   	
-    TInt Update();
-
-    TInt Close();
-
-private:
-
-    TBool iIsOpened;
-
-    CEapTlsPeapUiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;    
-
-	CArrayFixFlat<TEapTlsPeapUiCipherSuite>* iDataPtr;
-
-private:
-
-    void FetchDataL();
-    
-    void UpdateL();
-};
-
-#endif //_EAPTLSPEAPUICIPHERSUITES_H_
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 16.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUICONNECTION_H_
-#define _EAPTLSPEAPUICONNECTION_H_
-
-#include <e32std.h>
-#include <e32base.h>
-#include <d32dbms.h>
-#include <EapType.h>
-
-class CEapTlsPeapUiDataConnection;
-class CEapTlsPeapUiCipherSuites;
-class CEapTlsPeapUiCertificates;
-class CEapTlsPeapUiEapTypes;
-class MEapTlsPeapUiCertificates;
-class CPacStoreDatabase;
-
-class CEapTlsPeapUiConnection : public CBase
-{
-
-public:
-
-	// This creates a connection between EAP plugin and the EAP UI.
-	// aTunnelingType - the Vendor-Type of Tunneling EAP type.
-	// aEapType - the Vendor-Type of the EAP type 
-	// Supported Vendor-ID here is 0x 0 (3 bytes) for both.
-
-    CEapTlsPeapUiConnection(
-        const TIndexType aIndexType,
-        const TInt aIndex,
-        const TInt aTunnelingType,
-        const TInt aEapType);
-
-    ~CEapTlsPeapUiConnection();
-
-    TInt Connect();
-
-    TInt Close();
-
-    CEapTlsPeapUiDataConnection * GetDataConnection();
-
-	CEapTlsPeapUiCipherSuites * GetCipherSuiteConnection();
-	
-	CEapTlsPeapUiCertificates * GetCertificateConnection(MEapTlsPeapUiCertificates * const aParent);
-	
-	CEapTlsPeapUiEapTypes * GetEapTypeConnection();
-
-    TIndexType GetIndexType();
-
-    TInt GetIndex();
-
-	// Returns the Vendor-Type of Tunneling EAP type, in this EAP type.
-	// Supported Vendor-ID here is 0x 0 (3 bytes).
-    TInt GetTunnelingType();
-
-	// Returns the Vendor-Type of this EAP type.
-	// Supported Vendor-ID here is 0x 0 (3 bytes).
-    TInt GetEapType();
-
-    TInt GetDatabase(RDbNamedDatabase & aDatabase);
-    
-    // Check if there's the PAC store master key.
-    // Call Connect() before doing this and Close() after.	
-    // Returns ETrue if there is master key. EFalse if there is not.
-	TBool IsPacStoreMasterKeyPresentL();
-
-    // This destroys the PAC store if it is created already.
-    // Call Connect() before doing this and Close() after.
-    // Returns KErrNone if successful. Symbian error code otherwise.
-	TInt DestroyPacStore();
-	
-    // This check if the PAC store (or PAC store master key) can be decrypted 
-	// with the password provided.
-    // Call Connect() before doing this and Close() after.	
-    // Returns ETrue if successful.
-	TBool VerifyPacStorePasswordL(const TDesC& aPacStorePw);
-	
-    // This creates the PAC store master key with the password provided.
-    // Call Connect() before doing this and Close() after.	
-    // Returns KErrNone if successful. Symbian error code otherwise.
-	TInt CreatePacStoreMasterKey(const TDesC& aPacStorePw);
-	
-	CPacStoreDatabase * GetPacStoreDb();
-	
-protected:
-
-    // Bearer type
-	TIndexType iIndexType;
-	
-	// Unique index
-	TInt iIndex;
-
-	// This stores the Vendor-Type of Tunneling EAP type. Supported Vendor-ID here is 0x 0 (3 bytes).
-	TInt iTunnelingType;
-
-	// This stores the Vendor-Type of the EAP type. Supported Vendor-ID here is 0x 0 (3 bytes).
-	TInt iEapType;
-	
-    TBool iIsConnected;
-
-    // database names, handlers etc...
-
-    CEapTlsPeapUiDataConnection * iDataConn;
-
-	CEapTlsPeapUiCipherSuites * iCipherSuites;
-		
-	CEapTlsPeapUiEapTypes * iEapTypes;
-	
-	CEapTlsPeapUiCertificates * iCertificates;	
-	
-    RDbNamedDatabase iDbNamedDatabase;
-
-    RDbs iDbs;
-    
-private:
-	
-    void ConnectL();
-    
-private:
-	
-	CPacStoreDatabase * iPacStoreDb;
-	
-};
-
-#endif
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiDataConnection.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 10.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUIDATACONNECTION_H_
-#define _EAPTLSPEAPUIDATACONNECTION_H_
-
-#include <e32base.h>
-
-class CEapTlsPeapUiConnection;
-class CEapTlsPeapUiTlsPeapData;
-
-
-class CEapTlsPeapUiDataConnection : public CBase
-{
-
-public:
-
-    CEapTlsPeapUiDataConnection(CEapTlsPeapUiConnection * aUiConn);
-
-    ~CEapTlsPeapUiDataConnection();
-
-    TInt Open();
-
-    TInt GetData(CEapTlsPeapUiTlsPeapData ** aDataPtr);
-
-   	TInt Update();
-
-    TInt Close();
-
-protected:
-
-    TBool iIsOpened;
-
-    CEapTlsPeapUiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;
-
-    RDbView iView;
-    
-    CDbColSet* iColSet;
-   
-    CEapTlsPeapUiTlsPeapData * iDataPtr;
-
-private:
-	// Functions.
-	
-    void FetchDataL();
-    void UpdateDataL();
-    
-private:	
-	// Member variables.
-
-	// Only used with EAP-FAST. Can't use the falg here.
-    RDbView iFastSpecificView;
-    
-   // Only used with EAP-FAST. Can't use the flag here.
-    CDbColSet*  iFastSpecificColSet;
-
-};
-
-#endif // _EAPTLSPEAPUIDATACONNECTION_H_
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiEapType.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 10.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUIEAPTYPE_H_
-#define _EAPTLSPEAPUIEAPTYPE_H_
-
-#include <e32std.h>
-
-class TEapTlsPeapUiEapType
-{
-public:
-    TBool		iIsEnabled;        
-    TBuf8<8>  	iEapType;      // UID of Expanded EAP type.
-};
-
-#endif // _EAPTLSPEAPUIEAPTYPE_H_
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiEapTypes.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 10.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUIEAPTYPES_H_
-#define _EAPTLSPEAPUIEAPTYPES_H_
-
-#include <e32base.h>
-
-class CEapTlsPeapUiConnection;
-class TEapTlsPeapUiEapType;
-
-class CEapTlsPeapUiEapTypes : public CBase
-{
-
-public:
-
-    CEapTlsPeapUiEapTypes(CEapTlsPeapUiConnection * const aUiConn);
-
-    ~CEapTlsPeapUiEapTypes();
-
-    TInt Open();
-
-    TInt GetEapTypes(CArrayFixFlat<TEapTlsPeapUiEapType> ** aDataPtr);
-   	
-    TInt Update();
-
-    TInt Close();
-
-private:
-
-    TBool iIsOpened;
-
-    CEapTlsPeapUiConnection * iUiConn;
-
-    RDbNamedDatabase iDatabase;
-
-    CArrayFixFlat<TEapTlsPeapUiEapType>* iDataPtr;    
-    
-private:
-
-
-    void FetchExpandedDataL();
-    
-    void UpdateExpandedDataL();
-    
-};
-
-#endif // _EAPTLSPEAPUIEAPTYPES_H_
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTlsPeapUiTlsPeapData.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 14.1.2 %
-*/
-
-#ifndef _EAPTLSPEAPUITLSPEAPDATA_H_
-#define _EAPTLSPEAPUITLSPEAPDATA_H_
-
-#include <e32std.h>
-#include <e32base.h>
-
-const TInt KMaxLengthOfUsername=255;
-const TInt KMaxLengthOfPassword=255;
-
-const TInt KMaxLengthOfPapUserName = 253; // according to UI spec
-const TInt KMaxLengthOfPapPassword = 128; // according to UI spec
-
-class CEapTlsPeapUiTlsPeapData : public CBase
-{
-public:
-
-    CEapTlsPeapUiTlsPeapData();
-
-    ~CEapTlsPeapUiTlsPeapData();
-
-    TDes& GetManualUsername();
-
-    TBool * GetUseManualUsername();
-
-    TDes& GetManualRealm();
-
-    TBool * GetUseManualRealm();
-    
-    TBool * GetAllowVersion0();
-    
-    TBool * GetAllowVersion1();
-    
-    TBool * GetAllowVersion2();
-    
-    // New member functions for EAP-FAST 
-    
-    TBool * GetTlsPrivacy();
-    
-    TBool * GetAuthProvModeAllowed();
-
-    TBool * GetUnauthProvModeAllowed();
-    
-    TDes& GetPacStorePassword();
-
-public: // new, for TTLS PAP
-    
-    TDes& GetPapUserName();
-
-    TDes& GetPapPassword();
-
-    TBool* GetPapPasswordPrompt();
-
-private:
-
-    TBuf<KMaxLengthOfUsername> iManualUsername;
-
-    TBool iUseManualUsername;
-
-    TBuf<KMaxLengthOfUsername> iManualRealm;
-
-    TBool iUseManualRealm;
-    
-    TBool iAllowVersion0;
-    
-    TBool iAllowVersion1;
-    
-    TBool iAllowVersion2;
-    
-    // New member variables for EAP-FAST
-    TBool iTlsPrivacy;
-    
-    TBool iAuthProvModeAllowed;
-
-    TBool iUnauthProvModeAllowed;
-    
-    TBuf<KMaxLengthOfPassword> iPacStorePassword;
-    
-    TBuf<KMaxLengthOfPapUserName> iPapUserName;
-
-    TBuf<KMaxLengthOfPapPassword> iPapPassword;
-
-    TBool iPapPasswordPrompt;
-    
-};
-
-#endif
-
-// End of file
--- a/accesssec_plat/eaptlspeap_db_api/inc/EapTtlsPapNotifierStruct.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 7.1.2 %
-*/
-
-#ifndef EAPTTLSPAPNOTIFIERSTRUCT_H
-#define EAPTTLSPAPNOTIFIERSTRUCT_H
-
-/**
-* UID of PAP notifier to display authentication query dialog.
-*/ 
-const TUid KPapNotifierUid = { 0x200159A9 };
-
-/**
-* Maximum PAP challenge length.
-*/ 
-const TUint KMaxPapChallengeLength = 4096;
-
-/**
-* Maximum PAP user name.
-*/ 
-const TUint KMaxPapUserNameLength = 253;
-
-/**
-* Maximum PAP password length.
-*/ 
-const TUint KMaxPapPasswordLength = 128;
-
-/**
-* Data structure defines user name, password and password prompt.
-*/ 
-struct TPapUserNamePasswordInfo
-    {
-    /**
-    * True if password prompt is enabled, False - otherwise.
-    */ 
- 	TBool iPasswordPromptEnabled;
- 	
-    /*
- 	* Buffer for user name.
- 	*/
- 	TBuf16<KMaxPapUserNameLength> iUserName;
- 	
- 	/**
- 	* Buffer for password.
- 	*/ 
- 	TBuf16<KMaxPapPasswordLength> iPassword;   
-    };
-
-/**
-* Data structure used in notifier communication.
-*/ 
-struct TPapUiNotifierInfo
-    {
-    enum TPapUiNotifierState
-        {
-        EPapUiNotifierAuthQueryDialog,               /* 0 */
-        EPapUiNotifierPapChallengeSize,              /* 1 */
-        EPapUiNotifierPapChallengeMsgDialog,         /* 2 */
-        EPapUiNotifierPapChallengeReplyQueryDialog,  /* 3 */
-        // ...
-        EPapUiNotifierStatesNumber                   /* 4 */ // keep always as last element
-        };
-
-    /**
-    * State defines UI notifier logic.
-    */ 
-    TPapUiNotifierState iState;
-
-    /**
-    * Data structure defines user name, password and password prompt.
-    */  
-    TPapUserNamePasswordInfo iUsrPwdInfo;
-    	
-	/**
-	* PAP challenge message.
-	*/
-	TUint iSrvChallengeSize;
-	TBuf16<KMaxPapChallengeLength> iPapChallenge;
-    };
-
-/**
-* Defines user action: accepting or cancelling
-* authentication query dialog.
-*/ 
-enum EPapNotifierUserAction
-    {
-    EPapNotifierUserActionOk,
-    EPapNotifierUserActionCancel
-    };
-    
-#endif // EAPTTLSPAPNOTIFIERSTRUCT_H
-
-// End of File
--- a/accesssec_plat/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ b/accesssec_plat/group/bld.inf	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 6 %
+* %version: 8 %
 */
 
 PRJ_PLATFORMS
@@ -25,19 +25,7 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-#include "../wapi_security_settings_ui_api/group/bld.inf"
-#include "../wep_security_settings_ui_api/group/bld.inf"
-#include "../wi-fi_protected_setup_ui_api/group/bld.inf"
-#include "../wlan_eap_settings_ui_api/group/bld.inf"
-#include "../wpa_security_settings_ui_api/group/bld.inf"
 #include "../eap_vpn_api/group/bld.inf"
-#include "../eapsim_db_api/group/bld.inf"
 #include "../eap_type_api/group/bld.inf"
-#include "../eaptlspeap_db_api/group/bld.inf"
-#include "../eapleap_db_api/group/bld.inf"
-#include "../eapgtc_db_api/group/bld.inf"
-#include "../eapmschapv2_db_api/group/bld.inf"
-#include "../eapaka_db_api/group/bld.inf"
-#include "../wapi_db_api/group/bld.inf"
 
 PRJ_TESTMMPFILES
\ No newline at end of file
--- a/accesssec_plat/wapi_db_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                WAPI DB API
-*
-*/
-
-/*
-* %version: 4.1.2 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/WapiCertificates.h     MW_LAYER_PLATFORM_EXPORT_PATH(WapiCertificates.h)
\ No newline at end of file
--- a/accesssec_plat/wapi_db_api/inc/WapiCertificates.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  WAPI authentication protocols.
-*
-*/
-
-/*
-* %version: 14 %
-*/
-
-#ifndef _WAPICERTIFICATES_H_
-#define _WAPICERTIFICATES_H_
-
-#include <e32base.h>
-#include <e32std.h>
-
-
-const TInt KMaxLabelLength = 255;
-const TInt KMaxIdentityLength = 310;
-class CCertificateStoreDatabase;
-class abs_eap_am_tools_c;
-class dummy_wapi_core_c;
-class wapi_am_core_symbian_c;
-class ec_certificate_store_c;
-
-/**
-*  This is a wrapper class which can be used to handle WAPI related certificates
-*/
-class CWapiCertificates : /*public CBase,*/ public CActive
-{
-
-public:
-
-    IMPORT_C CWapiCertificates();
-    IMPORT_C ~CWapiCertificates();
-    
-    /**
-    * Function for creating the CWapiCertificates object
-    *
-    */
-    IMPORT_C static CWapiCertificates* NewL();
-    
-     /**
-    * Function for reserving memory for the internal data types
-    *
-    */
-    void ConstructL();
-    
-    /**
-    * Gets a list of the available WAPI user and CA certificates
-    * 
-    * NOTE that the caller is responsible for freeing the memory of the arrays
-    *
-    * @param aUserCerts Array of available WAPI User certificate labels
-    * @param aUserCertData Array of available WAPI User certificate identities
-    * @param aCACerts   Array of available WAPI CA certificate labels
-    * @param aCACertData   Array of available WAPI CA certificate identities
-    */
-    IMPORT_C void GetAllCertificateLabelsL( RArray<TBuf<KMaxLabelLength> > **aUserCerts, RArray<TBuf8<KMaxIdentityLength> > **aUserCertData,
-            RArray<TBuf<KMaxLabelLength> > **aCACerts, RArray<TBuf8<KMaxIdentityLength> >**aCACertData );
-	
-    /**
-    * Resets the WAPI Certificate store
-    *
-    */
-    IMPORT_C void ResetCertificateStoreL( );
-	
-    /**
-    * Gets the WAPI certificate configuration of a specific AP
-    *
-    * @param aId        Service table id
-    * @param aUserCert  Id matching the selected WAPI User certificate
-    * @param aCACert    Id matching the selected WAPI CA certificate
-    */
-    IMPORT_C void GetConfigurationL( const TInt aId, TDes& aCACert, TDes& aUserCert );
-	
-    /**
-    * Sets the WAPI certificate configuration of a specific AP
-    *
-    * @param aId          Service table id
-    * @param aCACertData  Selected WAPI CA certificate identity 
-    */
-    IMPORT_C void SetCACertL( const TInt aId, const TBuf8<KMaxIdentityLength> aCACertData );
-	
-    /**
-    * Sets the WAPI certificate configuration of a specific AP
-    *
-    * @param aId           Service table id
-    * @param aUserCertData Selected WAPI User certificate identity 
-    */
-    IMPORT_C void SetUserCertL( const TInt aId, const TBuf8<KMaxIdentityLength> aUserCertData );
-    
-    /**
-    * Delete AP related data from certificate database tables
-    *
-    * @param aId        Service table id
-    */
-    IMPORT_C void DeleteAPSpecificDataL( const TInt aId );
-    
-protected: // from CActive
-    
-    /**
-    * RunL from CActive
-    */    
-    void RunL();
-    
-    /**
-    * DoCancel from CActive
-    */    
-    void DoCancel();
-private:
-    // Pointer to the used certificate store object
-    CCertificateStoreDatabase* iCertDB; 
-    // amTools is needed for the certificate store object creation
-    abs_eap_am_tools_c* iAmTools;
-    dummy_wapi_core_c* iDummyCore;
-    // The pointer to the ec_certificate_store_c needed to create the wapi_am_core_symbian
-    ec_certificate_store_c* iEcCertStore;
-    // The pointer to the object needed to start the certificate import and reading of labels
-    wapi_am_core_symbian_c* iWapiCore;
-    	
-    // For wrapping asynchronous calls.
-    CActiveSchedulerWait iWait;
-};
-
-#endif // _WAPICERTIFICATES_H_
-
-// End of file
--- a/accesssec_plat/wapi_db_api/wapi_db_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-<api id="c0331af85644a1aab6d4a94443387df2" dataversion="1.0">
-<name>WAPI DB API</name>
-<description>Interface for the WAPI UI to access the settings in the WAPI DBMS database.</description>
-<type>c++</type>
-<subsystem>eapol</subsystem>
-<libs></libs>
-<release category="domain" sinceversion="5.0"/>
-<attributes>
-<htmldocprovided>no</htmldocprovided>
-<adaptation>no</adaptation>
-</attributes>
-</api>
--- a/accesssec_plat/wapi_security_settings_ui_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: File that exports the files belonging to  WAPI Security Settings UI API
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/wapisecuritysettingsui.h  MW_LAYER_PLATFORM_EXPORT_PATH( wapisecuritysettingsui.h )
-
-
-
-
--- a/accesssec_plat/wapi_security_settings_ui_api/inc/wapisecuritysettingsui.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares the main handler CWAPISecuritySettings, UI CWAPISecuritySettingsUI and public API for the WAPI Security Settings. 
-*
-*/
-
-/*
-* %version: 10 %
-*/
-
-#ifndef WAPISECURITYSETTINGSUI_H
-#define WAPISECURITYSETTINGSUI_H
-
-// INCLUDES
-
-#include <e32base.h>
-#include <WapiCertificates.h>
-
-#include <metadatabase.h>
-#include <commsdattypesv1_1.h>
-
-using namespace CommsDat;
-
-// FORWARD DECLARATIONS
-class CEikonEnv;
-class CWAPISecuritySettingsUi;
-class CWAPISecuritySettingsUiImpl;
-class CWAPISecuritySettingsImpl;
-class CCommsDatabase;
-
-// CLASS DECLARATION
-/*
-* WAPI Security Settings. Enables loading, saving and editing the settings
-* (editing via CWAPISecuritySettingsUi).
-* Proxy around the real implementation in CWAPISecuritySettingsUiImpl. 
-*/
-NONSHARABLE_CLASS( CWAPISecuritySettings ) : public CBase
-    {
-
-    public: // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @return The constructed CWAPISecuritySettings object.
-        */
-        IMPORT_C static CWAPISecuritySettings* NewL();
-
-
-        /**
-        * Destructor.
-        */
-        IMPORT_C ~CWAPISecuritySettings();
-
-
-    public:     // Types
-
-        enum TEvent                     // Events happening during edit.
-            {
-            ENone           = 0x0000,   // Nothing happened.
-            EModified       = 0x0001,   // Data changed.
-            EValid          = 0x0010,   // All data entered are valid, they can be
-                                        // saved
-            
-            EExitReq        = 0x0020,   // Exit option requested, also caller 
-                                        // app should close
-            EShutDownReq    = 0x0040    // ShutDown was requested
-            };
-        
-        enum TWapiKeyFormat
-            {
-            EWapiKeyAscii   = 0,
-            EWapiKeyHex     = 1
-            };
-        
-    public:     // New methods
-
-        
-        /**
-        * Edit WAPI certificate settings.
-        * @param aUi UI to be used.
-        * @param aTitle Title Pane text to display during edit.
-        * @return Exit reason.
-        */
-        IMPORT_C TInt EditL( CWAPISecuritySettingsUi& aUi, 
-                             const TDesC& aTitle );
-
-        
-        /**
-        * Load WAPI certificate settings and configuration from database.
-        * @param aIapRecordID 
-        * @param aSession Commsdat session
-        */
-        IMPORT_C void LoadL( TUint32 aIapRecordId, CMDBSession& aSession );
-
-        /**
-        * Tells if the settings are valid and can be saved
-        * @return ETrue if all the compulsory settings have been entered
-        */
-        IMPORT_C TBool IsValid() const;
-
-        /**
-        * Save WAPI certificate settings of the IAP to the database.
-        * @param aIapRecordID 
-        * @param aSession Commsdat session
-        */
-        IMPORT_C void SaveL( TUint32 aIapRecordId, CMDBSession& aSession ) const;
-
-        /**
-        * Sets the Pre-shared key. Also sets Authentication method to PSK.
-        * @param aKeyFormat     Key format
-        * @param aPreSharedKey  The key to be set
-        */
-        IMPORT_C void SetPreSharedKeyL( const TWapiKeyFormat aKeyFormat, const TDesC& aPreSharedKey );
-                
-        /**
-        * Delete AP related data from certificate database tables
-        *
-        * @param aId        Service table id
-        */
-        IMPORT_C void DeleteAPSpecificDataL( const TInt aId );
-    
-    private:    // Data 
-
-        // Implementation. Owned.
-        CWAPISecuritySettingsImpl* iImpl;  
-
-    };
-
-/**
-* User interface to edit WAPI Security Settings.
-* Proxy around the real implementation in CWAPISecuritySettingsUiImpl.
-*/
-NONSHARABLE_CLASS( CWAPISecuritySettingsUi ) : public CBase
-    {
-
-    public:     // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aEikEnv Eikon environment.
-        * @return The constructed CWAPISecuritySettingsUi object.
-        */
-        IMPORT_C static CWAPISecuritySettingsUi* NewL( CEikonEnv& aEikEnv );
-
-        /**
-        * Destructor.
-        */
-        IMPORT_C virtual ~CWAPISecuritySettingsUi();
-
-    private:    // Friends
-
-        friend class CWAPISecuritySettings;
-
-    private:    // Data 
-
-        // Implementation. Owned.
-        CWAPISecuritySettingsUiImpl* iImpl;
-
-    };
-#endif
-
-
-// End of File
--- a/accesssec_plat/wapi_security_settings_ui_api/wapi_security_settings_ui_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?>
-<api id="05dcacc9a3b2427e80999dead4919374" dataversion="1.0">
-<name>WAPI Security Settings UI API</name>
-<description>API for accessing WAPI security settings UI</description>
-<type>c++</type>
-<subsystem>networkingutilities</subsystem>
-<libs><lib name="wapisecuritysettingsui.lib"/>
-</libs>
-<release category="domain" sinceversion="5.0"/>
-<attributes>
-<htmldocprovided>yes</htmldocprovided>
-<adaptation>no</adaptation>
-</attributes>
-</api>
--- a/accesssec_plat/wep_security_settings_ui_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: File that exports the files belonging to  WEP Security Settings UI API
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/WEPSecuritySettingsUI.h  MW_LAYER_PLATFORM_EXPORT_PATH( WEPSecuritySettingsUI.h )
-
-
-
-
--- a/accesssec_plat/wep_security_settings_ui_api/inc/WEPSecuritySettingsUI.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,246 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares the main handler CWEPSecuritySettings, UI CWEPSecuritySettingsUI and public API for the WEP Security Settings. 
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-#ifndef WEPSECURITYSETTINGSUI_H
-#define WEPSECURITYSETTINGSUI_H
-
-// INCLUDES
-
-#include <e32base.h>
-
-#include <metadatabase.h>
-using namespace CommsDat;
-
-// FORWARD DECLARATIONS
-class CEikonEnv;
-class CWEPSecuritySettingsUi;
-class CWEPSecuritySettingsUiImpl;
-class CWEPSecuritySettingsImpl;
-class CCommsDatabase;
-
-
-
-// CLASS DECLARATION
-/*
-* WEP Security Settings. Enables loading, saving and editing the settings
-* (editing via CWEPSecuritySettingsUi).
-* Proxy around the real implementation in CWEPSecuritySettingsUiImpl. 
-* No details of the actual data are exposed.
-*/
-NONSHARABLE_CLASS( CWEPSecuritySettings ) : public CBase
-    {
-
-    public: // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @return The constructed CWEPSecuritySettings object.
-        */
-        IMPORT_C static CWEPSecuritySettings* NewL();
-
-
-        /**
-        * Destructor.
-        */
-        IMPORT_C ~CWEPSecuritySettings();
-
-
-    public:     // Types
-
-        enum TEvent                     // Events happening during edit.
-            {
-            ENone           = 0x0000,   // Nothing happened.
-            EModified       = 0x0001,   // Data changed.
-            EValid          = 0x0010,   // All data entererd are valid, they
-                                        // can be saved
-            EExitReq        = 0x0020,   // Exit option requested, also caller 
-                                        // app should close
-            EShutDownReq    = 0x0040    // ShutDown was requested
-            };
-
-
-        // Members to be showed in the setting pages
-        enum TWepMember
-            {
-            EWepKeyInUse,           // To set key in use
-            EWepAuthentication,     // To set authentication type
-            EWepKeyConfiguration,   // To open the other settings (the three below)
-
-            EWepKeyLength,          // To set the length of the key
-            EWepKeyFormat,          // To choose the format of the key
-            EWepKeyData             // To set the key
-            };
-
-
-        // Enumeration of the possible keys in use
-        enum TWEPKeyInUse
-            {
-            EKeyNumber1,            // Key number 1
-            EKeyNumber2,            // Key number 2
-            EKeyNumber3,            // Key number 3
-            EKeyNumber4             // Key number 4
-            };
-
-
-        // Enumeration of the possible authentication types
-        enum TWEPAuthentication
-            {
-            EAuthOpen,              // Open authentication
-            EAuthShared             // Shared authentication
-            };
-
-
-        // Possible lengths of the keys
-        enum TWEPKeyLength
-            {
-            E40Bits,                // 40 bits
-            E104Bits,               // 104 bits
-            E232Bits                // 232 bits
-            };
-
-
-        // Possible formats of the keys
-        enum TWEPKeyFormat
-            {
-            EAscii,                 // Ascii format
-            EHexadecimal            // Hex format
-            };
-    
-    public:     // New methods
-
-        /**
-        * Load from database.
-        * @param aIapId Wlan Service Table Id of the IAP to be loaded
-        * @param aCommsDb Comms database.
-        */
-        IMPORT_C void LoadL( TUint32 aIapId, CCommsDatabase& aCommsDb );
-        
-        /**
-        * Edit the settings.
-        * @param aUi UI to be used.
-        * @param aTitle Title Pane text to display during edit.
-        * @return Exit reason.
-        */
-        IMPORT_C TInt EditL( CWEPSecuritySettingsUi& aUi, 
-                             const TDesC& aTitle );
-
-        /**
-        * Save to database.
-        * @param aIapId Wlan Service Table Id of the IAP to be saved
-        * @param aCommsDb Comms database.
-        */
-        IMPORT_C void SaveL( TUint32 aIapId, CCommsDatabase& aCommsDb ) const;
-        
-        /**
-        * Tells if the settings are valid and can be saved
-        * @return ETrue if all the compulsory settings have been entered
-        */
-        IMPORT_C TBool IsValid() const;
-
-        /**
-        * Sets the new data of the key
-        * @param aElement   Index of the element whose data has to be set.
-        * @param aKeyData   The new value for data of the key.
-        * @param aHex       ETrue if data is in Ascii format
-        * @return KErrNone if successful, or an error code
-        */
-        IMPORT_C TInt SetKeyDataL( const TInt aElement, const TDesC& aKeyData,
-                                   const TBool aHex );
-        
-        /**
-        * Load from database.
-        * @param aIapId Wlan Service Table Id of the IAP to be loaded
-        * @param aSession Session to CommsDat.
-        */
-        IMPORT_C void LoadL( TUint32 aIapId, CMDBSession& aSession );
-        
-        /**
-        * Save to database.
-        * @param aIapId Wlan Service Table Id of the IAP to be saved
-        * @param aSession Session to CommsDat.
-        */
-        IMPORT_C void SaveL( TUint32 aIapId, CMDBSession& aSession ) const;
-
-        /**
-        * Sets the index of the key to use.
-        * @param aKey   The key to be used for authentication.
-        */
-        IMPORT_C void SetKeyInUse( TWEPKeyInUse aKey );
-        
-        /**
-        * Sets the authentication type.
-        * @param aAuthentication   The authentication type.
-        */
-        IMPORT_C void SetAuthentication( TWEPAuthentication aAuthentication );
-        
-
-    private:    // Data 
-
-        // Implementation. Owned.
-        CWEPSecuritySettingsImpl* iImpl;  
-
-    };
-
-
-
-/**
-* User interface to edit WEP Security Settings.
-* Proxy around the real implementation in CWEPSecuritySettingsUiImpl.
-*/
-NONSHARABLE_CLASS( CWEPSecuritySettingsUi ) : public CBase
-    {
-
-    public:     // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aEikEnv Eikon environment.
-        * @return The constructed CWEPSecuritySettingsUi object.
-        */
-        IMPORT_C static CWEPSecuritySettingsUi* NewL( CEikonEnv& aEikEnv );
-
-        /**
-        * Destructor.
-        */
-        IMPORT_C virtual ~CWEPSecuritySettingsUi();
-
-    public:     // New methods
-
-        /**
-        * Component Validation Test.
-        * @return KErrNone.
-        */
-        IMPORT_C static TInt Cvt();
-
-    private:    // Friends
-
-        friend class CWEPSecuritySettings;
-
-    private:    // Data 
-
-        // Implementation. Owned.
-        CWEPSecuritySettingsUiImpl* iImpl;
-
-    };
-#endif
-
-
-// End of File
--- a/accesssec_plat/wep_security_settings_ui_api/wep_security_settings_ui_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?>
-<api id="c8f684fc1b499af65679c5dc7fb8d4b8" dataversion="1.0">
-<name>WEP Security Settings UI API</name>
-<description>API for accessing WEP security settings UI</description>
-<type>c++</type>
-<subsystem>networkingutilities</subsystem>
-<libs><lib name="wepsecuritysettingsui.lib"/>
-</libs>
-<release category="domain" sinceversion="3.2"/>
-<attributes>
-<htmldocprovided>yes</htmldocprovided>
-<adaptation>no</adaptation>
-</attributes>
-</api>
--- a/accesssec_plat/wi-fi_protected_setup_ui_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: File that exports the files belonging to  WiFi Protected Setup UI API
-*
-*/
-
-/*
-* %version: tr1cfwln#12 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/wifiprotuiclient.h  MW_LAYER_PLATFORM_EXPORT_PATH( wifiprotuiclient.h )
-../inc/WiFiProtReturn.h MW_LAYER_PLATFORM_EXPORT_PATH( wifiprotreturn.h )
-../inc/wifiprotuiddefs.h  MW_LAYER_PLATFORM_EXPORT_PATH( wifiprotuiddefs.h )
-../inc/wifiprotuiinprocess.h MW_LAYER_PLATFORM_EXPORT_PATH( wifiprotuiinprocess.h )
-
--- a/accesssec_plat/wi-fi_protected_setup_ui_api/inc/WiFiProtReturn.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares the common used constants and types for Wi-Fi Protected Setup. 
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef T_WIFIRETURN_H
-#define T_WIFIRETURN_H
-
-namespace WiFiProt
-    {
-    // Return value of Wi-Fi Protected Setup ( WPS ) Ui process
-    enum TWiFiReturn 
-        {
-        // WPS has been cancelled
-        EWiFiCancel,
-        // WPS has completed without any errors
-        EWiFiOK,
-        // User has selected the option not to use WPS
-        EWifiNoAuto
-        };
-    }
-
-#endif  // T_WIFIRETURN_H
-
-
-// End of File
--- a/accesssec_plat/wi-fi_protected_setup_ui_api/inc/wifiprotuiclient.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares the main handler, CWiFiProtUiClient and public API for the Wi-Fi Protected Settings. 
-*
-*/
-
-/*
-* %version: tr1cfwln#6 %
-*/
-
-#ifndef C_WIFIPROTUICLIENT_H
-#define C_WIFIPROTUICLIENT_H
-
-// INCLUDES
-
-#include <e32base.h>
-#include <wlanmgmtcommon.h>
-#include <wifiprotreturn.h>
-
-// FORWARD DECLARATIONS
-class CWiFiProtUiClientImpl;
-
-// CLASS DECLARATION
-/*
-* WiFi Protected Setup , used to show the user a sequence of dialogs to setup
-* a wlan network automatically
-* This class is just a proxy, the real implementation is in
-* CWiFiProtUiClientImpl. 
-* No details of the actual data are exposed.
-*/
-class CWiFiProtUiClient  : public CBase
-    {
-    public: // Constructors and destructor
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @return The constructed CWiFiProtUiClient object.
-        */
-        IMPORT_C static CWiFiProtUiClient* NewL();
-
-        /**
-        * Destructor.
-        */
-        IMPORT_C ~CWiFiProtUiClient();
-
-        // New methods
-
-        /**
-        * Starts WiFi Protected Setup sequence
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aConnectionNeeded - This parameter is not used anymore in
-        * the current implementation. It is just there to preserve
-        * compatibility. Please use StartWiFiProtConnL to configure a
-        * connection using Wi-Fi Protected Setup.
-        * @param aUidsReturned uids of the configured connection methods        
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use protected setup (No Automatic Setup).
-        * @param aStatus - Request status of the client       
-        */
-        IMPORT_C void StartWiFiProtL( const TWlanSsid& aSSid,
-                                      TBool aConnectionNeeded,
-                                      RArray<TUint32>& aUidsReturned,
-                                      WiFiProt::TWiFiReturn& aReturnValue,
-                                      TRequestStatus& aStatus );
-
-        /**
-        * Starts WiFi Protected Setup sequence - sync version
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aConnectionNeeded - This parameter is not used anymore in
-        * the current implementation. It is just there to preserve
-        * compatibility. Please use StartWiFiProtConnL to configure a
-        * connection using Wi-Fi Protected Setup.
-        * @param aUidsReturned uids of the configured connection methods        
-        * @return  - possible return values are ok, cancel process
-        * and not use protected setup (No Automatic Setup).
-        * We can return a value since the call is sychronous.
-        */
-        IMPORT_C WiFiProt::TWiFiReturn StartWiFiProtSyncL(
-                                          const TWlanSsid& aSSid,
-                                          TBool aConnectionNeeded,
-                                          RArray<TUint32>& aUidsReturned );
-
-        /**
-        * Cancels WiFi Protected Setup sequence
-        */
-        IMPORT_C void CancelWiFiProt( );
-        
-        /**
-        * Starts WiFi Protected Setup sequence in Connection initiation mode
-        * (WPS phase 2 implementation)
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aNetworkSettings configuration settings of the network to use
-        * for the connection (returned as the result of Protected Setup)      
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use protected setup (No Automatic Setup).
-        * @param aStatus - Request status of the client       
-        */
-        IMPORT_C void StartWiFiProtConnL( const TWlanSsid& aSSid,
-                                      TWlanProtectedSetupCredentialAttribute&
-                                        aNetworkSettings,
-                                      WiFiProt::TWiFiReturn& aReturnValue,
-                                      TRequestStatus& aStatus );
-
-    private:    // Data 
-        CWiFiProtUiClientImpl* iImpl;  ///< Implementation. Owned.
-    };
-
-#endif //C_WIFIPROTUICLIENT_H
-
-// End of File
--- a/accesssec_plat/wi-fi_protected_setup_ui_api/inc/wifiprotuiddefs.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of the UIDs used by Connection Dialogs
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-#ifndef WIFIPROTUIDDEFS_H
-#define WIFIPROTUIDDEFS_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CONSTANTS
-
-// UIDs for CConnDlg plugins
-
-// ID of Wi-Fi protected setup
-const TUid KUidWiFiProtSetup = { 0x10281BBF };
-
-#endif  // WIFIPROTUIDDEFS_H
-
-// End of File
--- a/accesssec_plat/wi-fi_protected_setup_ui_api/inc/wifiprotuiinprocess.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of CWifiProtUiInProcess
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-#ifndef C_WIFIPROTUIINPROCESS_H
-#define C_WIFIPROTUIINPROCESS_H
-
-
-// INCLUDES
-#include <cmmanagerext.h>
-#include <wlanmgmtcommon.h>
-#include <wifiprotreturn.h>
-
-class CWiFiProtDlgsPlugin;
-
-/**
- * CWifiProtUiInProcess class
- * Private interface class that allows the client to run
- * Wi-Fi Protected Setup directly, without using the
- * Notifier Framework
- */
-class CWifiProtUiInProcess : public CBase
-    {
-    
-public:
-    
-    /**
-    * NewL function
-    * @param  aCmManagerExt Cm Manager to use during Wi-Fi Protected Setup
-    * return CWifiProtUiInProcess*
-    */
-    IMPORT_C static CWifiProtUiInProcess* NewL( RCmManagerExt*
-                                                aCmManagerExt );
-
-    /**
-    * Destructor
-    */
-    ~CWifiProtUiInProcess( );
-
-    /**
-    * Starts Wi-Fi Protected Setup
-    * Private interface to be used by applications with ui
-    * runs in the same process, so pointers can be passed
-    * @param aSSid contains SSid of the network we want to configure 
-    * @param aConnectionNeeded ETrue if we need a connection via the
-    * configured network 
-    * @return  possible return values are ok, cancel process and not use 
-    * protected setup (No Auto).        
-    */    
-    IMPORT_C WiFiProt::TWiFiReturn StartFromUiL( const TWlanSsid& aSSid,
-                                             TBool aConnectionNeeded,
-                                             RArray<TUint32>& aUidsReturned);
-
-private:    
-
-    /**
-    * Constructor
-    */
-    CWifiProtUiInProcess( );
-    
-    /**
-    * Second phase constructor
-    * @param aCmManagerExt CmManager to use
-    */
-    void ConstructL( RCmManagerExt* aCmManagerExt = NULL );
-                  
-private:
-    CWiFiProtDlgsPlugin* iWiFiProtDlgsPlugin; // notifier plugin class
-    };
-
-
-#endif // C_WIFIPROTUIINPROCESS_H
-
-// End of File
--- a/accesssec_plat/wi-fi_protected_setup_ui_api/wi-fi_protected_setup_ui_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" ?>
-<api id="51d47a7acd0e5650437ca61be7412caf" dataversion="1.0">
-  <name>Wi-Fi Protected Setup UI API</name>
-  <description>Provides UI related functionality for Wi-Fi Protected Setup. This API can be called from a process without UI context.</description>
-  <type>c++</type>
-  <subsystem>networkingutilities</subsystem>
-  <libs>
-    <lib name="wifiprotclient.lib" />
-    <lib name="wifiprotplugin.lib" />
-  </libs>
-  <release category="domain"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/accesssec_plat/wlan_eap_settings_ui_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: File that exports the files belonging to  WLAN EAP Settings UI API
-*
-*/
-
-/*
-* %version: tr1cfwln#11 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/EapAkaUi.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapAkaUi.h)
-../inc/EapMschapv2Ui.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapMschapv2Ui.h)
-../inc/EapTtlsUi.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTtlsUi.h)
-../inc/EapTlsUi.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTlsUi.h)
-../inc/EapSimUi.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapSimUi.h)
-../inc/EapLeapUi.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapLeapUi.h)
-../inc/EapPeapUi.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapPeapUi.h)
-../inc/eapfastui.h     MW_LAYER_PLATFORM_EXPORT_PATH(eapfastui.h)
-../inc/EapGtcUi.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapGtcUi.h)
-../inc/papui.h     MW_LAYER_PLATFORM_EXPORT_PATH(papui.h)
-../inc/EAPPluginConfigurationIf.inl     MW_LAYER_PLATFORM_EXPORT_PATH(EAPPluginConfigurationIf.inl)
-../inc/EAPPluginConfigurationIf.h     MW_LAYER_PLATFORM_EXPORT_PATH(EAPPluginConfigurationIf.h)
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EAPPluginConfigurationIf.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is the ECOM interface for EAP Plugin Configuration.
-*
-*/
-
-/*
-* %version: 13 %
-*/
-
-#ifndef __EAPPLUGINCONFIGURATIONIF_H__
-#define __EAPPLUGINCONFIGURATIONIF_H__
-
-
-// INCLUDES
-#include <e32base.h>
-#include <ecom/ecom.h>
-
-
-// CONSTANTS
-const TUid KEapPluginConfigInterfaceUid = {0x102072CA};
-
-
-// CLASS DECLARATION
-/**
-* CEAPPluginConfigurationIf class
-* ECOM interface for EAP PLugin Configuration.
-*/
-class CEAPPluginConfigurationIf : public CBase
-    {
-    public:
-        inline static CEAPPluginConfigurationIf* NewL( 
-                                                const TDesC8& aMatchString );
-    
-        inline virtual ~CEAPPluginConfigurationIf();
-    
-        /**
-        * Load the EAP Plugin configuration
-        * @param    aWPAEAPPlugin   The list of EAPs in use as it was read from
-        *                           WlanEapList column of WLANServiceTable. In 
-        *                           output it contains the new list as it has 
-        *                           to be written in the same column of 
-        *                           database.
-        * @param    aConnectionName The name of the connection.
-        * @return   The ID of the button pressed to close configuration: 
-        *           typically EAknSoftkeyBack for back, EAknCmdExit for a 
-        *           request of exit or EEikCmdExit for a request of shutdown
-        */
-        virtual TInt EAPPluginConfigurationL( TDes& aWPAEAPPlugin, 
-                                              const TUint32 aIapID, 
-                                              const TDes& aConnectionName ) = 0;
-                                         
-       /**
-        * Load the EAP Plugin configuration (with expanded EAP types)
-        * @param    aWPAEnabledEAPPlugin   The list of enabled EAPs in use as 
-        *                           it was read from WlanEnabledEapList column 
-        *                           of WLANServiceTable. In output it contains 
-        *                           the new list as it has to be written in the 
-        *                           same column of database.
-        * @param    aWPADisabledEAPPlugin   The list of disabled EAPs in use as
-        *                           it was read from WlanDisabledEapList column 
-        *                           of WLANServiceTable. In output it contains 
-        *                           the new list as it has to be written in the 
-        *                           same column of database.
-        * @param    aConnectionName The name of the connection.
-        * @return   The ID of the button pressed to close configuration: 
-        *           typically EAknSoftkeyBack for back, EAknCmdExit for a 
-        *           request of exit or EEikCmdExit for a request of shutdown
-        */
-        virtual TInt EAPPluginConfigurationL( TDes8& aWPAEnabledEAPPlugin, 
-                                              TDes8& aWPADisabledEAPPlugin, 
-                                              const TUint32 aIapID, 
-                                              const TDes& aConnectionName ) = 0;
-
-        /**
-        * Shows the EAP type info.
-        */
-        virtual void ShowEAPTypeInfo() = 0;
-    
-        /**
-        * Deletes all EAP types' settings for
-        * the given IAP.
-        */
-        virtual void DeleteSettingsL( const TUint32 aIapID ) = 0;
-    
-        /**
-        * Changes the index of the EAP settings for all EAP types    
-        */
-        virtual void ChangeIapIDL( const TUint32 aOldIapID, 
-                                   const TUint32 aNewIapID ) = 0;
-
-	    /**
-        * Copies the EAP type settings to another ID
-        */
-	    virtual void CopySettingsL( const TUint32 aSourceIapID, 
-                                    const TUint32 aDestinationIapID ) = 0;
-
-
-    private: // Data    
-        // This variable holds the instance identifier.
-        TUid iDtor_ID_Key; 
-    };
-    
-
-#include "EAPPluginConfigurationIf.inl" 
-    
-#endif      // __EAPPLUGINCONFIGURATIONIF_H__
-
-// End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EAPPluginConfigurationIf.inl	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Inline functions of CEAPPluginConfigurationIf
-*
-*/
-
-/*
-* %version: 10 %
-*/
-
-#ifndef __EAPPLUGINCONFIGURATIONIF_INL__
-#define __EAPPLUGINCONFIGURATIONIF_INL__
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationIf::NewL
-// ---------------------------------------------------------
-//
-inline CEAPPluginConfigurationIf* CEAPPluginConfigurationIf::NewL( 
-                                                  const TDesC8& aMatchString )
-	{
-	TEComResolverParams resolverParams; 
-	resolverParams.SetDataType(aMatchString);
-	
-	TAny* ptr = REComSession::CreateImplementationL( 
-                            KEapPluginConfigInterfaceUid, 
-                            _FOFF( CEAPPluginConfigurationIf, iDtor_ID_Key ),
-                            resolverParams );
-
-	return REINTERPRET_CAST( CEAPPluginConfigurationIf*, ptr );
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationIf::~CEAPPluginConfigurationIf
-// ---------------------------------------------------------
-//
-inline CEAPPluginConfigurationIf::~CEAPPluginConfigurationIf()
-	{
-	// Unload DLL
-	REComSession::DestroyedImplementation( iDtor_ID_Key );
-	}
-
-
-#endif  // __EAPPLUGINCONFIGURATIONIF_INL__
-
-// End of file.
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EapAkaUi.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP AKA settings UI
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPAKAUI_H_
-#define _EAPAKAUI_H_
-
-// INCLUDES
-#include <EapAkaUiConnection.h> 
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CEapAkaUi : public CCoeControl
-    {
-    public: 
-        /**
-        * Destructor.
-        */
-        ~CEapAkaUi();
-
-        /**
-        * Two-phased constructor.
-        */
-        static CEapAkaUi* NewL( CEapAkaUiConnection* aConnection );
-
-        TInt InvokeUiL();
-
-    protected:
-        CEapAkaUi( CEapAkaUiConnection* aConnection );
-
-        void ConstructL();
-
-    private:
-        CEapAkaUiConnection* iConnection;
-    };
-
-
-#endif // _EAPAKAUI_H_
-
-//  End of File
-
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EapGtcUi.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP GTC settings UI
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPGTCUI_H_
-#define _EAPGTCUI_H_
-
-// INCLUDES
-#include <EapGtcUiConnection.h>
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CEapGtcUi : public CCoeControl
-    {
-    public: 
-        /**
-        * Destructor.
-        */
-        ~CEapGtcUi();
-
-        /**
-        * Two-phased constructor.
-        */
-        static CEapGtcUi* NewL( CEapGtcUiConnection* aConnection );
-
-        TInt InvokeUiL();
-
-    protected:
-        /**
-        * C++ default constructor.
-        */
-        CEapGtcUi( CEapGtcUiConnection* aConnection );
-
-        void ConstructL();
-
-    private:
-        CEapGtcUiConnection* iConnection;
-    };
-
-
-#endif // _EAPGTCUI_H_
-
-//  End of File
\ No newline at end of file
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EapLeapUi.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP LEAP UI
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPLEAPUI_H_
-#define _EAPLEAPUI_H_
-
-// INCLUDES
-#include <EapLeapUiConnection.h>
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CEapLeapUi : public CCoeControl
-    {
-    public: 
-        ~CEapLeapUi();
-        static CEapLeapUi* NewL( CEapLeapUiConnection* aConnection );    
-        TInt InvokeUiL();
-
-    protected:
-        CEapLeapUi( CEapLeapUiConnection* aConnection );
-        void ConstructL();        
-
-    private:
-        CEapLeapUiConnection* iConnection;
-    };
-
-
-#endif //_EAPLEAPUI_H_
-
-//  End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EapMschapv2Ui.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP MsChapv2 UI
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPMSCHAPV2UI_H_
-#define _EAPMSCHAPV2UI_H_
-
-// INCLUDES
-#include <EapMsChapV2UiConnection.h>
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CEapMsChapV2Ui : public CCoeControl
-    {
-    public: 
-        ~CEapMsChapV2Ui();
-        static CEapMsChapV2Ui* NewL( CEapMsChapV2UiConnection* aConnection );
-        TInt InvokeUiL();
-
-    protected:
-        CEapMsChapV2Ui( CEapMsChapV2UiConnection* aConnection );
-        void ConstructL();        
-
-    private:
-        CEapMsChapV2UiConnection* iConnection;
-    };
-
-
-#endif // _EAPMSCHAPV2UI_H_
-
-//  End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EapPeapUi.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP PEAP settings UI
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPPEAPUI_H_
-#define _EAPPEAPUI_H_
-
-// INCLUDES
-#include "EapTlsPeapUiConnection.h"
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CEapPeapUi : public CCoeControl
-    {
-    public: 
-        ~CEapPeapUi();
-        static CEapPeapUi* NewL( CEapTlsPeapUiConnection* aConnection, 
-                                 TIndexType aIndexType, 
-                                 TInt aIndex );
-        TInt InvokeUiL();
-
-    protected:
-        CEapPeapUi( CEapTlsPeapUiConnection* aConnection, 
-                    TIndexType aIndexType, 
-                    TInt aIndex );
-        void ConstructL();        
-
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-        TIndexType iIndexType; 
-        TInt iIndex;        
-    };
-
-
-#endif // _EAPPEAPUI_H_
-
-//  End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EapSimUi.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP SIM settings UI
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPSIMUI_H_
-#define _EAPSIMUI_H_
-
-// INCLUDES
-#include <EapSimUiConnection.h>
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CEapSimUi : public CCoeControl
-    {
-    public: 
-        ~CEapSimUi();
-        static CEapSimUi* NewL( CEapSimUiConnection* aConnection );    
-        TInt InvokeUiL();
-
-    protected:
-        CEapSimUi( CEapSimUiConnection* aConnection );
-        void ConstructL();        
-
-    private:
-        CEapSimUiConnection* iConnection;
-    };
-
-
-#endif  // _EAPSIMUI_H_
-
-//  End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EapTlsUi.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP TLS settings UI
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPTLSUI_H_
-#define _EAPTLSUI_H_
-
-// INCLUDES
-#include <coecntrl.h>
-#include "EapTlsPeapUiConnection.h"
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CEapTlsUi : public CCoeControl
-    {
-    public: 
-        ~CEapTlsUi();
-        static CEapTlsUi* NewL( CEapTlsPeapUiConnection* aConnection );    
-        TInt InvokeUiL();
-
-    protected:
-        CEapTlsUi( CEapTlsPeapUiConnection* aConnection );
-        void ConstructL();        
-
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-    };
-
-
-#endif //_EAPTLSUI_H_
-
-//  End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/EapTtlsUi.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP TTLS settings UI
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPTTLSUI_H_
-#define _EAPTTLSUI_H_
-
-// INCLUDES
-#include "EapTlsPeapUiConnection.h"
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CEapTtlsUi : public CCoeControl
-    {
-    public: 
-        ~CEapTtlsUi();
-        static CEapTtlsUi* NewL( CEapTlsPeapUiConnection* aConnection, 
-                                 TIndexType aIndexType, 
-                                 TInt aIndex );
-        TInt InvokeUiL();
-
-    protected:
-        CEapTtlsUi( CEapTlsPeapUiConnection* aConnection, 
-                    TIndexType aIndexType, 
-                    TInt aIndex );
-        void ConstructL();        
-
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-        TIndexType iIndexType; 
-        TInt iIndex;
-    };
-
-
-#endif // _EAPTTLSUI_H_
-
-//  End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/eapfastui.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP FAST settings UI
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-#ifndef _EAPFASTUI_H_
-#define _EAPFASTUI_H_
-
-// INCLUDES
-#include "EapTlsPeapUiConnection.h"
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CEapFastUi : public CCoeControl
-    {
-    public: 
-        ~CEapFastUi();
-        static CEapFastUi* NewL( CEapTlsPeapUiConnection* aConnection, 
-                                 TIndexType aIndexType, 
-                                 TInt aIndex );
-        TInt InvokeUiL();
-
-    protected:
-        CEapFastUi( CEapTlsPeapUiConnection* aConnection, 
-                    TIndexType aIndexType, 
-                    TInt aIndex );
-        void ConstructL();        
-
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-        TIndexType iIndexType; 
-        TInt iIndex;        
-    };
-
-
-#endif // _EAPFASTUI_H_
-
-//  End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/inc/papui.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of PAP Config UI
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-#ifndef _PAPUI_H_
-#define _PAPUI_H_
-
-// INCLUDES
-#include <EapTlsPeapUiConnection.h>
-#include <coecntrl.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Main UI class definition
-*/
-class CPapUi : public CCoeControl
-    {
-    public: 
-        ~CPapUi();
-        static CPapUi* NewL( CEapTlsPeapUiConnection* aConnection );
-        TInt InvokeUiL();
-
-    protected:
-        CPapUi( CEapTlsPeapUiConnection* aConnection );
-        void ConstructL();        
-
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-    };
-
-
-#endif // _PAPUI_H_
-
-//  End of File
--- a/accesssec_plat/wlan_eap_settings_ui_api/wlan_eap_settings_ui_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-<api id="b201dac8921c275ba68ea6b0cfc18be9" dataversion="1.0">
-  <name>WLAN EAP Settings UI API</name>
-  <description>API for accessing EAP settings UI</description>
-  <type>c++</type>
-  <subsystem>networkingutilities</subsystem>
-  <libs>
-    <lib name="eapakaui.lib" />
-    <lib name="eapgtcui.lib" />
-    <lib name="eapmschapv2ui.lib" />
-    <lib name="eappeapui.lib" />
-    <lib name="eapsimui.lib" />
-    <lib name="eaptlsui.lib" />
-    <lib name="eapttlsui.lib" />
-    <lib name="papui.lib" />
-  </libs>
-  <release category="domain"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/accesssec_plat/wpa_security_settings_ui_api/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: File that exports the files belonging to  WPA Security Settings UI API
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/WPASecuritySettingsUI.h  MW_LAYER_PLATFORM_EXPORT_PATH( WPASecuritySettingsUI.h )
-
-
-
-
-
--- a/accesssec_plat/wpa_security_settings_ui_api/inc/WPASecuritySettingsUI.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,252 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares the main handler CWPASecuritySettings, UI CWPASecuritySettingsUI and public API for the WPA Security Settings. 
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-#ifndef WPASECURITYSETTINGSUI_H
-#define WPASECURITYSETTINGSUI_H
-
-// INCLUDES
-
-#include <e32base.h>
-
-#include <metadatabase.h>
-using namespace CommsDat;
-
-// FORWARD DECLARATIONS
-class CEikonEnv;
-class CWPASecuritySettingsUi;
-class CWPASecuritySettingsUiImpl;
-class CWPASecuritySettingsImpl;
-class CCommsDatabase;
-
-
-// ENUMERATIONS
-
-// Security mode in use
-enum TSecurityMode
-    {
-    ESecurityMode8021x = 4,     // 802.1x
-    ESecurityModeWpa = 8        // WPA
-    };
-
-
-// Type of saving
-enum TTypeOfSaving
-    {
-    ESavingEditedAP,      // Save an already existing AP that was edited.
-    ESavingBrandNewAP,    // Save a just created AP started from default values
-    ESavingNewAPAsACopy   // Save a new AP as a copy of an already existing AP
-    };
-
-
-
-
-// CLASS DECLARATION
-/*
-* WPA Security Settings. Enables loading, saving and editing the settings
-* (editing via CWPASecuritySettingsUi).
-* Proxy around the real implementation in CWPASecuritySettingsUiImpl. 
-* No details of the actual data are exposed.
-*/
-NONSHARABLE_CLASS( CWPASecuritySettings ) : public CBase
-    {
-
-    public: // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aSecurityMode  The chosen security mode. It can be 
-        *                       ESecurityMode8021x or ESecurityModeWpa
-        * @return The constructed CWPASecuritySettings object.
-        */
-        IMPORT_C static CWPASecuritySettings* NewL( 
-                                                TSecurityMode aSecurityMode );
-
-
-        /**
-        * Destructor.
-        */
-        IMPORT_C ~CWPASecuritySettings();
-
-
-    public:     // Types
-
-        enum TEvent                     // Events happening during edit.
-            {
-            ENone           = 0x0000,   // Nothing happened.
-            EModified       = 0x0001,   // Data changed.
-            EValid          = 0x0010,   // All data entererd are valid, they
-                                        // can be saved
-            EExitReq        = 0x0020,   // Exit option requested, also caller 
-                                        // app should close
-            EShutDownReq    = 0x0040    // ShutDown was requested
-            };
-
-
-    public:     // New methods
-
-        /**
-        * Load from database.
-        * @param Wlan Service Table Id of the IAP to be loaded
-        * @param aCommsDb Comms database.
-        */
-        IMPORT_C void LoadL( TUint32 aIapId, CCommsDatabase& aCommsDb );
-        
-
-        /**
-        * Edit the settings.
-        * @param aUi UI to be used.
-        * @param aTitle Title Pane text to display during edit.
-        * @return Exit reason.
-        */
-        IMPORT_C TInt EditL( CWPASecuritySettingsUi& aUi, 
-                             const TDesC& aTitle );
-
-        /**
-        * Save to database.
-        * @param aIapId     Wlan Service Table Id of the IAP to be saved
-        * @param aCommsDb   Comms database.
-        * @param aTypeOfSaving	Tells what kind of AP we are going to save: it 
-        *                       can be ESavingEditedAP, ESavingBrandNewAP, or 
-        *                       ESavingNewAPAsACopy
-        * @param aOldIapId  The old Id of the IAP; it is used to save the EAP 
-        *                   configuration, only when aIsNewAP is ETrue
-        */
-        IMPORT_C void SaveL( TUint32 aIapId, 
-                             CCommsDatabase& aCommsDb, 
-                             TTypeOfSaving aTypeOfSaving, 
-                             TUint32 aOldIapId ) const;
-
-
-        /**
-        * Delete from database. It actually just removes EAP Configuration.
-        * @param aIapId Id of the IAP to be saved
-        */
-        IMPORT_C void DeleteL( TUint32 aIapId ) const;
-
-
-        /**
-        * Tells if the settings are valid and can be saved
-        * @return ETrue if all the compulsory settings have been entered
-        */
-        IMPORT_C TBool IsValid() const;
-
-
-        /**
-        * Sets the Pre-shared key
-        * @param aPreSharedKey  The key to be set
-        * @return KErrNone if successful, or an error code
-        */
-        IMPORT_C TInt SetWPAPreSharedKey( const TDesC& aPreSharedKey );
-        
-        
-        /**
-        * Load from database.
-        * @param aIapId Wlan Service Table Id of the IAP to be loaded
-        * @param aSession CommsDat session.
-        */
-        IMPORT_C void LoadL( TUint32 aIapId, CMDBSession& aSession );
-        
-        
-        /**
-        * Save to database.
-        * @param aIapId     Wlan Service Table Id of the IAP to be saved
-        * @param aSession   CommsDat session.
-        * @param aTypeOfSaving	Tells what kind of AP we are going to save: it 
-        *                       can be ESavingEditedAP, ESavingBrandNewAP, or 
-        *                       ESavingNewAPAsACopy
-        * @param aOldIapId  The old Id of the IAP; it is used to save the EAP 
-        *                   configuration, only when aIsNewAP is ETrue
-        */
-        IMPORT_C void SaveL( TUint32 aIapId, 
-                             CMDBSession& aSession, 
-                             TTypeOfSaving aTypeOfSaving, 
-                             TUint32 aOldIapId ) const;
-
-        /**
-        * Sets the list of enabled EAP types.
-        * @param aEnabledPluginList Enumeration of enabled plugins 
-        *                           in expanded EAP type format
-        * @return KErrNone if successful, or an error code
-        */
-        IMPORT_C TInt SetWPAEnabledEAPPlugin( const TDesC8& aEnabledPluginList );
-
-
-        /**
-        * Sets the list of disabled EAP types
-        * @param aDisabledPluginList Enumeration of disabled plugins
-        *                            in expanded EAP type format
-        * @return KErrNone if successful, or an error code
-        */
-        IMPORT_C TInt SetWPADisabledEAPPlugin( const TDesC8& aDisabledPluginList );
-        
-
-    private:    // Data 
-
-        // Implementation. Owned.
-        CWPASecuritySettingsImpl* iImpl;  
-
-    };
-
-
-
-/**
-* User interface to edit WPA Security Settings.
-* Proxy around the real implementation in CWPASecuritySettingsUiImpl.
-*/
-NONSHARABLE_CLASS( CWPASecuritySettingsUi ) : public CBase
-    {
-
-    public:     // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aEikEnv Eikon environment.
-        * @return The constructed CWPASecuritySettingsUi object.
-        */
-        IMPORT_C static CWPASecuritySettingsUi* NewL( CEikonEnv& aEikEnv );
-
-        /**
-        * Destructor.
-        */
-        IMPORT_C virtual ~CWPASecuritySettingsUi();
-
-    public:     // New methods
-
-        /**
-        * Component Validation Test.
-        * @return KErrNone.
-        */
-        IMPORT_C static TInt Cvt();
-
-    private:    // Friends
-
-        friend class CWPASecuritySettings;
-
-    private:    // Data 
-
-        // Implementation. Owned.
-        CWPASecuritySettingsUiImpl* iImpl;
-
-    };
-#endif
-
-
-// End of File
--- a/accesssec_plat/wpa_security_settings_ui_api/wpa_security_settings_ui_api.metaxml	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?>
-<api id="fd8f25a824236be38b322b959f1e378e" dataversion="1.0">
-<name>WPA Security Settings UI API</name>
-<description>API for accessing WPA security settings UI</description>
-<type>c++</type>
-<subsystem>networkingutilities</subsystem>
-<libs><lib name="wpasecuritysettingsui.lib"/>
-</libs>
-<release category="domain" sinceversion="3.2"/>
-<attributes>
-<htmldocprovided>yes</htmldocprovided>
-<adaptation>no</adaptation>
-</attributes>
-</api>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/AbsEapTlsPeapUiCertificates.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 6.1.2 %
+*/
+
+#ifndef _ABSEAPTLSPEAPUICERTIFICATES_H_
+#define _ABSEAPTLSPEAPUICERTIFICATES_H_
+
+// INCLUDES
+
+// CLASS DECLARATION
+/**
+* Class for 
+*/
+class MEapTlsPeapUiCertificates
+{
+public:
+	/**
+	* 
+	*/
+	virtual void CompleteReadCertificates(const TInt aResult) = 0;	
+};
+
+#endif // _ABSEAPTLSPEAPUICERTIFICATES_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/CertEntry.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 8.1.2 %
+*/
+
+#ifndef _SCERTENTRY_H_
+#define _SCERTENTRY_H_
+
+
+#include <unifiedcertstore.h>
+#include <cctcertinfo.h>
+
+/* This is the maximum length of a certificate primary/secondary name we are interested in. */
+const TUint32 KMaxNameLength = 64;
+
+struct SCertEntry
+{
+	TCertLabel iLabel;	// This holds only the certificate label.
+	TKeyIdentifier iSubjectKeyId;
+	TBuf<KMaxNameLength> iPrimaryName; // Primary name of the certificate if any.
+	TBuf<KMaxNameLength> iSecondaryName; // Secondary name of the certificate if any.
+};
+
+#endif // _SCERTENTRY_H_
+
+// End of file
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapFastNotifierStruct.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 7.1.2 %
+*/
+
+#ifndef EAPFASTNOTIFIERSTRUCT_H
+#define EAPFASTNOTIFIERSTRUCT_H
+
+const TUid KEapFastNotifierUid = {0x2000F8DF};
+
+const TUint KMaxEapFastNotifierBufLength = 255;
+
+enum EEapFastNotifierUiItem
+{
+	EEapFastNotifierPacStorePwQuery,         /* 0 */
+	EEapFastNotifierWrongPacStorePwNote,     /* 1 */
+	EEapFastNotifierAuthProvWaitNote,        /* 2 */
+	EEapFastNotifierAuthProvWaitNoteEnd,     /* 3 */
+	EEapFastNotifierUnauthProvWaitNote,      /* 4 */
+	EEapFastNotifierUnauthProvWaitNoteEnd,   /* 5 */
+	EEapFastNotifierInstallPacConfirmQuery,	 /* 6 */
+	EEapFastNotifierProvSuccessNote,         /* 7 */
+	EEapFastNotifierProvNotSuccessNote,      /* 8 */
+	EEapFastNotifierPacFilePwQuery,          /* 9 */
+	EEapFastNotifierWrongPacFilePwNote,      /* 10 */
+	EEapFastNotifierCreateMasterkeyQuery,    /* 11 */
+	EEapFastNotifierUiItemsNumber            /* 12 */ // keep always as last element
+};
+
+enum EEapFastNotifierUserAction
+{
+	EEapFastNotifierUserActionOk,
+	EEapFastNotifierUserActionCancel
+};
+
+struct TEapFastNotifierStruct
+{
+	EEapFastNotifierUiItem iEapFastNotifierUiItem;
+	TBuf<KMaxEapFastNotifierBufLength> iEapFastNotifierBuffer;
+	EEapFastNotifierUserAction iEapFastNotifierUserAction;
+};
+
+#endif // EAPFASTNOTIFIERSTRUCT_H
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiCertificate.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 6.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUICERTIFICATE_H_
+#define _EAPTLSPEAPUICERTIFICATE_H_
+
+#include <e32std.h>
+#include <CertEntry.h>
+
+class TEapTlsPeapUiCertificate
+{
+public:
+	SCertEntry iCertEntry;
+	TBool iIsEnabled;		
+};
+
+#endif // _EAPTLSPEAPUICERTIFICATE_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiCertificates.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,86 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 7.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUICERTIFICATES_H_
+#define _EAPTLSPEAPUICERTIFICATES_H_
+
+#include <CertEntry.h>
+#include <e32base.h>
+
+class CEapTlsPeapUiConnection;
+class TEapTlsPeapUiCertificate;
+class CEapTlsPeapCertFetcher;
+class MEapTlsPeapUiCertificates;
+
+class CEapTlsPeapUiCertificates : public CBase
+{
+
+public:
+
+    CEapTlsPeapUiCertificates(CEapTlsPeapUiConnection * const aUiConn, MEapTlsPeapUiCertificates * const aParent);
+
+    ~CEapTlsPeapUiCertificates();
+
+    TInt Open();
+
+	TInt GetCertificates(CArrayFixFlat<TEapTlsPeapUiCertificate> ** aUserCerts,
+						 CArrayFixFlat<TEapTlsPeapUiCertificate> ** aCACerts);
+    
+    TInt Update();
+
+    TInt Close();
+    
+    void CompleteReadCertificatesL(
+		const RArray<SCertEntry>& aUserCerts, 
+		const RArray<SCertEntry>& aCACerts);
+
+
+private:
+
+    TBool iIsOpened;
+
+    CEapTlsPeapUiConnection * iUiConn;
+
+    RDbNamedDatabase iDatabase;
+
+    CArrayFixFlat<TEapTlsPeapUiCertificate> * iUserCerts;
+
+    CArrayFixFlat<TEapTlsPeapUiCertificate> * iCACerts;
+
+    TRequestStatus iStatus;
+	
+	CEapTlsPeapCertFetcher* iCertFetcher;
+	
+	MEapTlsPeapUiCertificates* iParent;
+	
+private:
+
+	void FetchDataL(
+		const TDesC& aTableName,
+		const RArray<SCertEntry>& aAvailableCerts,
+		CArrayFixFlat<TEapTlsPeapUiCertificate> * const aArray);    
+    
+    void UpdateL();
+};
+
+#endif // _EAPTLSPEAPUICERTIFICATES_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiCipherSuite.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 6.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUICIPHERSUITE_H_
+#define _EAPTLSPEAPUICIPHERSUITE_H_
+
+#include <e32std.h>
+
+class TEapTlsPeapUiCipherSuite
+{
+public:
+
+    TBool                           iIsEnabled;        
+    TUint							iCipherSuite;
+};
+
+#endif //_EAPTLSPEAPUICIPHERSUITE_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiCipherSuites.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,67 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 7.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUICIPHERSUITES_H_
+#define _EAPTLSPEAPUICIPHERSUITES_H_
+
+#include <e32base.h>
+
+class CEapTlsPeapUiConnection;
+class TEapTlsPeapUiCipherSuite;
+
+
+class CEapTlsPeapUiCipherSuites : public CBase
+{
+
+public:
+
+    CEapTlsPeapUiCipherSuites(CEapTlsPeapUiConnection * const aUiConn);
+
+    ~CEapTlsPeapUiCipherSuites();
+
+    TInt Open();
+
+    TInt GetCipherSuites(CArrayFixFlat<TEapTlsPeapUiCipherSuite> ** aDataPtr);
+   	
+    TInt Update();
+
+    TInt Close();
+
+private:
+
+    TBool iIsOpened;
+
+    CEapTlsPeapUiConnection * iUiConn;
+
+    RDbNamedDatabase iDatabase;    
+
+	CArrayFixFlat<TEapTlsPeapUiCipherSuite>* iDataPtr;
+
+private:
+
+    void FetchDataL();
+    
+    void UpdateL();
+};
+
+#endif //_EAPTLSPEAPUICIPHERSUITES_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiConnection.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,146 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 16.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUICONNECTION_H_
+#define _EAPTLSPEAPUICONNECTION_H_
+
+#include <e32std.h>
+#include <e32base.h>
+#include <d32dbms.h>
+#include <EapType.h>
+
+class CEapTlsPeapUiDataConnection;
+class CEapTlsPeapUiCipherSuites;
+class CEapTlsPeapUiCertificates;
+class CEapTlsPeapUiEapTypes;
+class MEapTlsPeapUiCertificates;
+class CPacStoreDatabase;
+
+class CEapTlsPeapUiConnection : public CBase
+{
+
+public:
+
+	// This creates a connection between EAP plugin and the EAP UI.
+	// aTunnelingType - the Vendor-Type of Tunneling EAP type.
+	// aEapType - the Vendor-Type of the EAP type 
+	// Supported Vendor-ID here is 0x 0 (3 bytes) for both.
+
+    CEapTlsPeapUiConnection(
+        const TIndexType aIndexType,
+        const TInt aIndex,
+        const TInt aTunnelingType,
+        const TInt aEapType);
+
+    ~CEapTlsPeapUiConnection();
+
+    TInt Connect();
+
+    TInt Close();
+
+    CEapTlsPeapUiDataConnection * GetDataConnection();
+
+	CEapTlsPeapUiCipherSuites * GetCipherSuiteConnection();
+	
+	CEapTlsPeapUiCertificates * GetCertificateConnection(MEapTlsPeapUiCertificates * const aParent);
+	
+	CEapTlsPeapUiEapTypes * GetEapTypeConnection();
+
+    TIndexType GetIndexType();
+
+    TInt GetIndex();
+
+	// Returns the Vendor-Type of Tunneling EAP type, in this EAP type.
+	// Supported Vendor-ID here is 0x 0 (3 bytes).
+    TInt GetTunnelingType();
+
+	// Returns the Vendor-Type of this EAP type.
+	// Supported Vendor-ID here is 0x 0 (3 bytes).
+    TInt GetEapType();
+
+    TInt GetDatabase(RDbNamedDatabase & aDatabase);
+    
+    // Check if there's the PAC store master key.
+    // Call Connect() before doing this and Close() after.	
+    // Returns ETrue if there is master key. EFalse if there is not.
+	TBool IsPacStoreMasterKeyPresentL();
+
+    // This destroys the PAC store if it is created already.
+    // Call Connect() before doing this and Close() after.
+    // Returns KErrNone if successful. Symbian error code otherwise.
+	TInt DestroyPacStore();
+	
+    // This check if the PAC store (or PAC store master key) can be decrypted 
+	// with the password provided.
+    // Call Connect() before doing this and Close() after.	
+    // Returns ETrue if successful.
+	TBool VerifyPacStorePasswordL(const TDesC& aPacStorePw);
+	
+    // This creates the PAC store master key with the password provided.
+    // Call Connect() before doing this and Close() after.	
+    // Returns KErrNone if successful. Symbian error code otherwise.
+	TInt CreatePacStoreMasterKey(const TDesC& aPacStorePw);
+	
+	CPacStoreDatabase * GetPacStoreDb();
+	
+protected:
+
+    // Bearer type
+	TIndexType iIndexType;
+	
+	// Unique index
+	TInt iIndex;
+
+	// This stores the Vendor-Type of Tunneling EAP type. Supported Vendor-ID here is 0x 0 (3 bytes).
+	TInt iTunnelingType;
+
+	// This stores the Vendor-Type of the EAP type. Supported Vendor-ID here is 0x 0 (3 bytes).
+	TInt iEapType;
+	
+    TBool iIsConnected;
+
+    // database names, handlers etc...
+
+    CEapTlsPeapUiDataConnection * iDataConn;
+
+	CEapTlsPeapUiCipherSuites * iCipherSuites;
+		
+	CEapTlsPeapUiEapTypes * iEapTypes;
+	
+	CEapTlsPeapUiCertificates * iCertificates;	
+	
+    RDbNamedDatabase iDbNamedDatabase;
+
+    RDbs iDbs;
+    
+private:
+	
+    void ConnectL();
+    
+private:
+	
+	CPacStoreDatabase * iPacStoreDb;
+	
+};
+
+#endif
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiDataConnection.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 10.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUIDATACONNECTION_H_
+#define _EAPTLSPEAPUIDATACONNECTION_H_
+
+#include <e32base.h>
+
+class CEapTlsPeapUiConnection;
+class CEapTlsPeapUiTlsPeapData;
+
+
+class CEapTlsPeapUiDataConnection : public CBase
+{
+
+public:
+
+    CEapTlsPeapUiDataConnection(CEapTlsPeapUiConnection * aUiConn);
+
+    ~CEapTlsPeapUiDataConnection();
+
+    TInt Open();
+
+    TInt GetData(CEapTlsPeapUiTlsPeapData ** aDataPtr);
+
+   	TInt Update();
+
+    TInt Close();
+
+protected:
+
+    TBool iIsOpened;
+
+    CEapTlsPeapUiConnection * iUiConn;
+
+    RDbNamedDatabase iDatabase;
+
+    RDbView iView;
+    
+    CDbColSet* iColSet;
+   
+    CEapTlsPeapUiTlsPeapData * iDataPtr;
+
+private:
+	// Functions.
+	
+    void FetchDataL();
+    void UpdateDataL();
+    
+private:	
+	// Member variables.
+
+	// Only used with EAP-FAST. Can't use the falg here.
+    RDbView iFastSpecificView;
+    
+   // Only used with EAP-FAST. Can't use the flag here.
+    CDbColSet*  iFastSpecificColSet;
+
+};
+
+#endif // _EAPTLSPEAPUIDATACONNECTION_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiEapType.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,36 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 10.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUIEAPTYPE_H_
+#define _EAPTLSPEAPUIEAPTYPE_H_
+
+#include <e32std.h>
+
+class TEapTlsPeapUiEapType
+{
+public:
+    TBool		iIsEnabled;        
+    TBuf8<8>  	iEapType;      // UID of Expanded EAP type.
+};
+
+#endif // _EAPTLSPEAPUIEAPTYPE_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiEapTypes.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,68 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 10.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUIEAPTYPES_H_
+#define _EAPTLSPEAPUIEAPTYPES_H_
+
+#include <e32base.h>
+
+class CEapTlsPeapUiConnection;
+class TEapTlsPeapUiEapType;
+
+class CEapTlsPeapUiEapTypes : public CBase
+{
+
+public:
+
+    CEapTlsPeapUiEapTypes(CEapTlsPeapUiConnection * const aUiConn);
+
+    ~CEapTlsPeapUiEapTypes();
+
+    TInt Open();
+
+    TInt GetEapTypes(CArrayFixFlat<TEapTlsPeapUiEapType> ** aDataPtr);
+   	
+    TInt Update();
+
+    TInt Close();
+
+private:
+
+    TBool iIsOpened;
+
+    CEapTlsPeapUiConnection * iUiConn;
+
+    RDbNamedDatabase iDatabase;
+
+    CArrayFixFlat<TEapTlsPeapUiEapType>* iDataPtr;    
+    
+private:
+
+
+    void FetchExpandedDataL();
+    
+    void UpdateExpandedDataL();
+    
+};
+
+#endif // _EAPTLSPEAPUIEAPTYPES_H_
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTlsPeapUiTlsPeapData.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,109 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 14.1.2 %
+*/
+
+#ifndef _EAPTLSPEAPUITLSPEAPDATA_H_
+#define _EAPTLSPEAPUITLSPEAPDATA_H_
+
+#include <e32std.h>
+#include <e32base.h>
+
+const TInt KMaxLengthOfUsername=255;
+const TInt KMaxLengthOfPassword=255;
+
+const TInt KMaxLengthOfPapUserName = 253; // according to UI spec
+const TInt KMaxLengthOfPapPassword = 128; // according to UI spec
+
+class CEapTlsPeapUiTlsPeapData : public CBase
+{
+public:
+
+    CEapTlsPeapUiTlsPeapData();
+
+    ~CEapTlsPeapUiTlsPeapData();
+
+    TDes& GetManualUsername();
+
+    TBool * GetUseManualUsername();
+
+    TDes& GetManualRealm();
+
+    TBool * GetUseManualRealm();
+    
+    TBool * GetAllowVersion0();
+    
+    TBool * GetAllowVersion1();
+    
+    TBool * GetAllowVersion2();
+    
+    // New member functions for EAP-FAST 
+    
+    TBool * GetTlsPrivacy();
+    
+    TBool * GetAuthProvModeAllowed();
+
+    TBool * GetUnauthProvModeAllowed();
+    
+    TDes& GetPacStorePassword();
+
+public: // new, for TTLS PAP
+    
+    TDes& GetPapUserName();
+
+    TDes& GetPapPassword();
+
+    TBool* GetPapPasswordPrompt();
+
+private:
+
+    TBuf<KMaxLengthOfUsername> iManualUsername;
+
+    TBool iUseManualUsername;
+
+    TBuf<KMaxLengthOfUsername> iManualRealm;
+
+    TBool iUseManualRealm;
+    
+    TBool iAllowVersion0;
+    
+    TBool iAllowVersion1;
+    
+    TBool iAllowVersion2;
+    
+    // New member variables for EAP-FAST
+    TBool iTlsPrivacy;
+    
+    TBool iAuthProvModeAllowed;
+
+    TBool iUnauthProvModeAllowed;
+    
+    TBuf<KMaxLengthOfPassword> iPacStorePassword;
+    
+    TBuf<KMaxLengthOfPapUserName> iPapUserName;
+
+    TBuf<KMaxLengthOfPapPassword> iPapPassword;
+
+    TBool iPapPasswordPrompt;
+    
+};
+
+#endif
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eaptlspeap_db_api/EapTtlsPapNotifierStruct.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,110 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 7.1.2 %
+*/
+
+#ifndef EAPTTLSPAPNOTIFIERSTRUCT_H
+#define EAPTTLSPAPNOTIFIERSTRUCT_H
+
+/**
+* UID of PAP notifier to display authentication query dialog.
+*/ 
+const TUid KPapNotifierUid = { 0x200159A9 };
+
+/**
+* Maximum PAP challenge length.
+*/ 
+const TUint KMaxPapChallengeLength = 4096;
+
+/**
+* Maximum PAP user name.
+*/ 
+const TUint KMaxPapUserNameLength = 253;
+
+/**
+* Maximum PAP password length.
+*/ 
+const TUint KMaxPapPasswordLength = 128;
+
+/**
+* Data structure defines user name, password and password prompt.
+*/ 
+struct TPapUserNamePasswordInfo
+    {
+    /**
+    * True if password prompt is enabled, False - otherwise.
+    */ 
+ 	TBool iPasswordPromptEnabled;
+ 	
+    /*
+ 	* Buffer for user name.
+ 	*/
+ 	TBuf16<KMaxPapUserNameLength> iUserName;
+ 	
+ 	/**
+ 	* Buffer for password.
+ 	*/ 
+ 	TBuf16<KMaxPapPasswordLength> iPassword;   
+    };
+
+/**
+* Data structure used in notifier communication.
+*/ 
+struct TPapUiNotifierInfo
+    {
+    enum TPapUiNotifierState
+        {
+        EPapUiNotifierAuthQueryDialog,               /* 0 */
+        EPapUiNotifierPapChallengeSize,              /* 1 */
+        EPapUiNotifierPapChallengeMsgDialog,         /* 2 */
+        EPapUiNotifierPapChallengeReplyQueryDialog,  /* 3 */
+        // ...
+        EPapUiNotifierStatesNumber                   /* 4 */ // keep always as last element
+        };
+
+    /**
+    * State defines UI notifier logic.
+    */ 
+    TPapUiNotifierState iState;
+
+    /**
+    * Data structure defines user name, password and password prompt.
+    */  
+    TPapUserNamePasswordInfo iUsrPwdInfo;
+    	
+	/**
+	* PAP challenge message.
+	*/
+	TUint iSrvChallengeSize;
+	TBuf16<KMaxPapChallengeLength> iPapChallenge;
+    };
+
+/**
+* Defines user action: accepting or cancelling
+* authentication query dialog.
+*/ 
+enum EPapNotifierUserAction
+    {
+    EPapNotifierUserActionOk,
+    EPapNotifierUserActionCancel
+    };
+    
+#endif // EAPTTLSPAPNOTIFIERSTRUCT_H
+
+// End of File
--- a/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/plugin/src/EapAka.cpp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/plugin/src/EapAka.cpp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 15.1.2 %
+* %version: 15.1.3 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -38,8 +38,7 @@
 #include "eap_am_type_aka_symbian.h"
 #include "EapAkaDbUtils.h"
 
-#include <EapAkaUiConnection.h>
-#include "EapAkaUi.h"
+
 
 
 #include "eap_am_tools_symbian.h"
@@ -142,20 +141,6 @@
 {
 	TInt buttonId(0);
  
-#ifdef USE_EAP_EXPANDED_TYPES
-
-    CEapAkaUiConnection uiConn(iIndexType, iIndex, iTunnelingType.get_vendor_type());
-	
-#else
-
-    CEapAkaUiConnection uiConn(iIndexType, iIndex, iTunnelingType);
-
-#endif //#ifdef USE_EAP_EXPANDED_TYPES
- 
-	CEapAkaUi* ui = CEapAkaUi::NewL(&uiConn);
-	CleanupStack::PushL(ui);
-	buttonId = ui->InvokeUiL();
-	CleanupStack::PopAndDestroy(ui);
 	return buttonId;
 }
 
--- a/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/plugin/src/EapSim.cpp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/plugin/src/EapSim.cpp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 16.1.2 %
+* %version: 16.1.3 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -38,8 +38,7 @@
 #include <EapTypeInfo.h>
 #include "EapSimDbUtils.h"
 
-#include <EapSimUiConnection.h>
-#include "EapSimUi.h"
+
 
 #include "eap_am_tools_symbian.h"
 
@@ -140,21 +139,7 @@
 TInt CEapSim::InvokeUiL()
 {
 	TInt buttonId(0);
-	
-#ifdef USE_EAP_EXPANDED_TYPES
 
-    CEapSimUiConnection uiConn(iIndexType, iIndex, iTunnelingType.get_vendor_type());
-	
-#else
-
-    CEapSimUiConnection uiConn(iIndexType, iIndex, iTunnelingType);
-
-#endif //#ifdef USE_EAP_EXPANDED_TYPES
-	
-	CEapSimUi* ui = CEapSimUi::NewL(&uiConn);
-	CleanupStack::PushL(ui);
-	buttonId = ui->InvokeUiL();
-	CleanupStack::PopAndDestroy(ui);
 	return buttonId;
 }
 // ----------------------------------------------------------
--- a/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 17.1.3 %
+* %version: 17.1.4 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -37,8 +37,6 @@
 #include <EapTypeInfo.h>
 #include "EapMsChapV2DbUtils.h"
 
-#include <EapMsChapV2UiConnection.h>
-#include "EapMschapv2Ui.h"
 
 // LOCAL CONSTANTS
 
@@ -161,22 +159,7 @@
 TInt CEapMsChapV2::InvokeUiL()
 {
 	TInt buttonId(0);
-   	
-#ifdef USE_EAP_EXPANDED_TYPES
 
-	CEapMsChapV2UiConnection uiConn(iIndexType, iIndex, 
-									iTunnelingType.get_vendor_type(), iEapType.get_vendor_type());
-	
-#else
-
-   	CEapMsChapV2UiConnection uiConn(iIndexType, iIndex, iTunnelingType, (TInt)iEapType);
-
-#endif //#ifdef USE_EAP_EXPANDED_TYPES
-	
-	CEapMsChapV2Ui* ui = CEapMsChapV2Ui::NewL(&uiConn);
-	CleanupStack::PushL(ui);
-	buttonId = ui->InvokeUiL();
-	CleanupStack::PopAndDestroy(ui);
 	return buttonId;
 }
 
--- a/eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapSecurID.cpp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapSecurID.cpp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 15.1.2 %
+* %version: 15.1.3 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -37,8 +37,6 @@
 #include <EapTypeInfo.h>
 #include "EapGtcDbUtils.h"
 
-#include <EapGtcUiConnection.h>
-#include "EapGtcUi.h"
 
 #include "eap_am_tools_symbian.h"
 
@@ -155,21 +153,6 @@
 TInt CEapSecurID::InvokeUiL()
 {
 	TInt buttonId(0);
-
-#ifdef USE_EAP_EXPANDED_TYPES
-
-    CEapGtcUiConnection uiConn(iIndexType, iIndex, iTunnelingType.get_vendor_type());
-	
-#else
-
-    CEapGtcUiConnection uiConn(iIndexType, iIndex, iTunnelingType);
-
-#endif //#ifdef USE_EAP_EXPANDED_TYPES
-	
-	CEapGtcUi* ui = CEapGtcUi::NewL(&uiConn);
-	CleanupStack::PushL(ui);
-	buttonId = ui->InvokeUiL();
-	CleanupStack::PopAndDestroy(ui);
 	return buttonId;
 }
 
--- a/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeap.cpp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeap.cpp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 35.1.3 %
+* %version: 35.1.4 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -35,15 +35,8 @@
 #include "EapTlsPeapGlobal.h"
 #include <EapTypeInfo.h>
 
-#include <EapTlsPeapUiConnection.h>
-#include <EapTlsUi.h>
-#include <EapPeapUi.h>
-#if defined(USE_TTLS_EAP_TYPE)
-	#include <EapTtlsUi.h>
-#endif
 
 #if defined(USE_FAST_EAP_TYPE)
-#include <eapfastui.h>
 #include "tls_application_eap_fast.h"
 #endif 
 
@@ -59,7 +52,6 @@
 #include "pac_store_db_symbian.h"
 #endif
 
-#include <papui.h>
 
 // LOCAL CONSTANTS
 
@@ -388,96 +380,6 @@
 TInt CEapTlsPeap::InvokeUiL()
 {
 	TInt buttonId(0);
-
-#ifdef USE_EAP_EXPANDED_TYPES
-
-	EAP_TRACE_DEBUG_SYMBIAN(
-		(_L("CEapTlsPeap::InvokeUiL -Start- iIndexType=%d, iIndex=%d, Tunneling vendor type=%d, Eap vendor type=%d \n"),
-		iIndexType,iIndex, iTunnelingType.get_vendor_type(), iEapType.get_vendor_type()));
-
-	CEapTlsPeapUiConnection uiConn(iIndexType, iIndex, 
-									iTunnelingType.get_vendor_type(), iEapType.get_vendor_type());
-	
-#else
-
-	EAP_TRACE_DEBUG_SYMBIAN(
-		(_L("CEapTlsPeap::InvokeUiL -Start- iIndexType=%d, iIndex=%d, iTunnelingType=%d, iEapType=%d \n"),
-		iIndexType, iIndex, iTunnelingType, iEapType));
-
-    CEapTlsPeapUiConnection uiConn(iIndexType, iIndex, iTunnelingType, iEapType);
-
-#endif //#ifdef USE_EAP_EXPANDED_TYPES
-
-	EAP_TRACE_DEBUG_SYMBIAN(
-			(_L("CEapTlsPeap::InvokeUiL Created UI connection \n")));
-
-#ifdef USE_EAP_EXPANDED_TYPES
-
-	switch (iEapType.get_vendor_type())
-	
-#else
-
-	switch (iEapType)
-
-#endif //#ifdef USE_EAP_EXPANDED_TYPES
-	{
-	case eap_type_tls:
-		{
-			CEapTlsUi* tls_ui = CEapTlsUi::NewL(&uiConn);	
-			CleanupStack::PushL(tls_ui);
-			buttonId = tls_ui->InvokeUiL();
-			CleanupStack::PopAndDestroy(tls_ui);	
-		}
-		break;
-
-	case eap_type_peap:
-		{
-			CEapPeapUi* peap_ui = CEapPeapUi::NewL(&uiConn, iIndexType, iIndex);
-			CleanupStack::PushL(peap_ui);
-			buttonId = peap_ui->InvokeUiL();
-			CleanupStack::PopAndDestroy(peap_ui);
-		}
-		break;
-
-#if defined (USE_TTLS_EAP_TYPE)
-	case eap_type_ttls:
-		{
-			CEapTtlsUi* ttls_ui = CEapTtlsUi::NewL(&uiConn, iIndexType, iIndex);
-			CleanupStack::PushL(ttls_ui);
-			buttonId = ttls_ui->InvokeUiL();
-			CleanupStack::PopAndDestroy(ttls_ui);
-		}
-		break;
-#endif
-
-#if defined (USE_FAST_EAP_TYPE)
-	case eap_type_fast:
-		{
-			CEapFastUi* fast_ui = CEapFastUi::NewL(&uiConn, iIndexType, iIndex);
-			CleanupStack::PushL(fast_ui);
-			buttonId = fast_ui->InvokeUiL();
-			CleanupStack::PopAndDestroy(fast_ui);
-		}
-		break;
-#endif
-		
-	case eap_type_ttls_plain_pap:
-	    {
-	        CPapUi* papUi = CPapUi::NewL( &uiConn );
-	        CleanupStack::PushL( papUi );
-	        buttonId = papUi->InvokeUiL();
-	        CleanupStack::PopAndDestroy( papUi );
-	    }
-	    break;
-
-	default:
-		// Should never happen
-		User::Leave(KErrArgument);
-	}
-	
-	EAP_TRACE_DEBUG_SYMBIAN(
-			(_L("CEapTlsPeap::InvokeUiL -End-\n")));
-	
 	return buttonId;
 }
 // ----------------------------------------------------------
--- a/eapol/eapol_framework/eapol_symbian/bwins/eapakau.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/eapol/eapol_framework/eapol_symbian/bwins/eapmschapv2u.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/eapol/eapol_framework/eapol_symbian/bwins/eapprotectedsetupu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/eapol/eapol_framework/eapol_symbian/bwins/eapsecuridu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/eapol/eapol_framework/eapol_symbian/bwins/eapsimu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/eapol/eapol_framework/eapol_symbian/bwins/eaptlspeapu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/eapol/eapol_framework/eapol_symbian/bwins/eapvpnifu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/eapol/eapol_framework/eapol_symbian/bwins/wlaneapolifu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-
--- a/eapol/eapol_framework/eapol_symbian/eabi/eapakau.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-
--- a/eapol/eapol_framework/eapol_symbian/eabi/eapmschapv2u.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-
--- a/eapol/eapol_framework/eapol_symbian/eabi/eapprotectedsetupu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-
--- a/eapol/eapol_framework/eapol_symbian/eabi/eapsecuridu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-
--- a/eapol/eapol_framework/eapol_symbian/eabi/eapsimu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-
--- a/eapol/eapol_framework/eapol_symbian/eabi/eaptlspeapu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-
--- a/eapol/eapol_framework/eapol_symbian/eabi/eapvpnifu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-
--- a/eapol/eapol_framework/eapol_symbian/eabi/wlaneapolifu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-
--- a/eapol/eapol_framework/eapol_symbian/group/eapaka.mmp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapaka.mmp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 17.2.3 %
+* %version: 17.2.4 %
 */
 
 #include <platform_paths.hrh>
@@ -59,11 +59,6 @@
 SOURCE		  eap_am_trace_symbian.cpp
 
 SOURCEPATH    	../am/type/aka/symbian/plugin/src
-SOURCE		  	EapAkaUiConnection.cpp
-SOURCE        	EapAkaUiDataConnection.cpp
-SOURCE        	EapAkaUiAkaData.cpp
-LIBRARY       	avkon.lib
-STATICLIBRARY 	eapakaui.lib
 
 USERINCLUDE		../am/include
 USERINCLUDE		../am/type/symbian/plugin/include
--- a/eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 18 %
+* %version: 19 %
 */
 
 #include <platform_paths.hrh>
@@ -62,11 +62,6 @@
 SOURCE		  eap_am_trace_symbian.cpp
 
 SOURCEPATH    ../am/type/mschapv2/symbian/plugin/src
-SOURCE		  EapMsChapV2UiConnection.cpp
-SOURCE        EapMsChapV2UiDataConnection.cpp
-SOURCE        EapMsChapV2UiMsChapV2Data.cpp
-LIBRARY       avkon.lib
-STATICLIBRARY	eapmschapv2ui.lib
 
 USERINCLUDE   ../am/type/mschapv2/symbian/plugin/inc
 USERINCLUDE   ../../eapol_common/type/mschapv2/include
--- a/eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 12.2.3 %
+* %version: 12.2.4 %
 */
 
 #include <platform_paths.hrh>
@@ -43,9 +43,6 @@
 SOURCEPATH	../am/type/symbian/plugin/common
 SOURCE		EapTypeInfo.cpp
 
-//SOURCEPATH    ../am/type/symbian/plugin/common
-//SOURCE	      EapProtectedSetupInfo.cpp
-
 SOURCEPATH    ../am/type/protected_setup
 SOURCE        eap_am_type_protected_setup_symbian.cpp
 SOURCE        EapProtectedSetupInterface.cpp
@@ -79,53 +76,6 @@
 USERINCLUDE   ../am/include
 USERINCLUDE   ../am/type/protected_setup/symbian/plugin/inc
 
-/*
-
-//USERINCLUDE   ../am/type/tls_peap/symbian/plugin/inc
-
-USERINCLUDE   ../../eapol_common/am/include
-USERINCLUDE   ../../eapol_common/type
-USERINCLUDE   ../../eapol_common/type/diameter/include
-
-#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
-USERINCLUDE   ../../eapol_common/type/mschapv2/include
-#endif //#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
-
-#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
-SOURCEPATH    ../../eapol_common/type/mschapv2/core
-SOURCE		  eap_type_mschapv2_header.cpp
-#endif //#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
-
-*/
-
-//SOURCEPATH		../am/type/tls_peap/symbian/plugin/inc
-//DOCUMENT		101f8e4c.loc
-
-/*
-// UI 
-SOURCEPATH    ../am/type/tls_peap/symbian/plugin/src
-SOURCE		  EapTlsPeapUiConnection.cpp
-SOURCE        EapTlsPeapUiDataConnection.cpp
-SOURCE        EapTlsPeapUiTlsPeapData.cpp
-SOURCE		  EapTlsPeapCertFetcher.cpp
-SOURCE        EapTlsPeapUiEapTypes.cpp
-SOURCE        EapTlsPeapUiCertificates.cpp
-SOURCE        EapTlsPeapUiCipherSuites.cpp
-*/
-/*
-LIBRARY       avkon.lib
-LIBRARY       AknSkins.lib
-LIBRARY       AknIcon.lib
-STATICLIBRARY eaptlsui.lib
-STATICLIBRARY eappeapui.lib
-STATICLIBRARY eapttlsui.lib
-LIBRARY		  x509certnameparser.lib		// For parsing of certificate label. 
-
-//SYSTEMINCLUDE /epoc32/include/ecom
-//SYSTEMINCLUDE /epoc32/include/libc
-//SYSTEMINCLUDE /epoc32/include/cshelp
-*/
-
 LANG		  SC
 
 MW_LAYER_SYSTEMINCLUDE // For the MiddleWare domain headers.
@@ -136,19 +86,6 @@
 
 LIBRARY 	wlandbif.lib
 
-//LIBRARY	    x509.lib crypto.lib certstore.lib ctframework.lib pkixcert.lib
-//LIBRARY		asn1.lib x500.lib bafl.lib eikctl.lib egul.lib fbscli.lib
-/*
-LIBRARY		gdi.lib
-LIBRARY		cryptography.lib
-LIBRARY     eikdlg.lib
-LIBRARY     eikcore.lib
-LIBRARY		CommonEngine.lib
-
-LIBRARY     hlplch.lib
-LIBRARY		featmgr.lib
-*/
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------
--- a/eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 16.2.3 %
+* %version: 16.2.4 %
 */
 
 #include <platform_paths.hrh>
@@ -60,11 +60,6 @@
 SOURCE		  eap_am_trace_symbian.cpp
 
 SOURCEPATH    ../am/type/securid/symbian/plugin/src
-SOURCE		  EapGtcUiConnection.cpp
-SOURCE        EapGtcUiDataConnection.cpp
-SOURCE        EapGtcUiGtcData.cpp
-LIBRARY       avkon.lib
-STATICLIBRARY eapgtcui.lib
 
 USERINCLUDE   ../am/type/securid/symbian/plugin/inc
 USERINCLUDE   ../../eapol_common/type/securid/include
--- a/eapol/eapol_framework/eapol_symbian/group/eapsim.mmp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapsim.mmp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 18.2.3 %
+* %version: 18.2.4 %
 */
 
 #include <platform_paths.hrh>
@@ -62,12 +62,6 @@
 SOURCE		  eap_am_trace_symbian.cpp
 
 SOURCEPATH    ../am/type/gsmsim/symbian/plugin/src
-SOURCE		  EapSimUiConnection.cpp
-SOURCE        EapSimUiDataConnection.cpp
-SOURCE        EapSimUiSimData.cpp
-
-LIBRARY       avkon.lib
-STATICLIBRARY eapsimui.lib
 
 USERINCLUDE   ../am/type/gsmsim/symbian/plugin/inc
 USERINCLUDE   ../../eapol_common/type/gsmsim/include
--- a/eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp	Mon May 03 12:33:23 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 44.2.3 %
+* %version: 44.2.4 %
 */
 
 #include <platform_paths.hrh>
@@ -116,7 +116,9 @@
 SOURCEPATH		../am/type/tls_peap/symbian/plugin/inc
 DOCUMENT		101f8e4c.loc
 
-// UI 
+// old ui db api
+USERINCLUDE   ../am/include/eaptlspeap_db_api
+// UI
 SOURCEPATH    ../am/type/tls_peap/symbian/plugin/src
 SOURCE		  EapTlsPeapUiConnection.cpp
 SOURCE        EapTlsPeapUiDataConnection.cpp
@@ -126,22 +128,10 @@
 SOURCE        EapTlsPeapUiCertificates.cpp
 SOURCE        EapTlsPeapUiCipherSuites.cpp
 
-LIBRARY       avkon.lib
-LIBRARY       AknSkins.lib
-LIBRARY       AknIcon.lib
-LIBRARY       aknnotify.lib
-LIBRARY       eiksrv.lib
-STATICLIBRARY eaptlsui.lib
-STATICLIBRARY eappeapui.lib
-STATICLIBRARY eapttlsui.lib
 
-STATICLIBRARY papui.lib
 
 LIBRARY		  x509certnameparser.lib		// For parsing of certificate label. 
 
-//SYSTEMINCLUDE /epoc32/include/ecom
-//SYSTEMINCLUDE /epoc32/include/libc
-//SYSTEMINCLUDE /epoc32/include/cshelp
 
 MW_LAYER_SYSTEMINCLUDE // For the MiddleWare domain headers.
 
--- a/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ b/group/bld.inf	Fri May 14 15:54:13 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: %
+* %version: 8 %
 */
 
 PRJ_PLATFORMS
@@ -25,7 +25,6 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-#include "../wlansecuritysettings/group/bld.inf"
 #include "../accesssec_plat/group/bld.inf"
 #include "../eapol/group/bld.inf"
 
--- a/layers.sysdef.xml	Mon May 03 12:33:23 2010 +0300
+++ b/layers.sysdef.xml	Fri May 14 15:54:13 2010 +0300
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
   <!ENTITY layer_real_source_path "sf/mw/accesssec" >
 ]>
 
-<SystemDefinition name="accesssec" schema="1.4.0">
+<SystemDefinition name="accesssec" schema="1.5.1">
   <systemModel>
     <layer name="mw_layer">
       <module name="accesssec">
         <unit unitID="netdo.accesssec" mrp="" bldFile="&layer_real_source_path;/group" name="accesssec" />
-      </module>
+        <unit unitID="netdo.accesssecqt" mrp="" bldFile="&layer_real_source_path;" name="accesssecqt" proFile="accesssec.pro" qmakeArgs="-r"/>
+     </module>
     </layer>
   </systemModel>
 </SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/cpwepui.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,65 @@
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+# Contributors:
+# Description:
+# Control Panel QT UI for WEP configuration
+# %version: 8 %
+TEMPLATE = lib
+TARGET = cpwepui
+DEPENDPATH += . \
+    ./src
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+    $$OS_LAYER_SYSTEMINCLUDE
+CONFIG += hb \
+    plugin
+LIBS += -lcpframework \
+    -lconnection_settings_shim
+MOC_DIR = _moc
+RCC_DIR = _rcc
+OBJECTS_DIR = _objects
+
+# Input
+HEADERS += inc/wepkeyvalidator.h \
+    traces/OstTraceDefinitions.h \
+    inc/wlansecuritycontrolpanelwepdefs.h \
+    inc/cpwepui.h
+SOURCES += src/wepkeyvalidator.cpp \
+    src/cpwepui.cpp
+symbian: { 
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.UID3 = 0x2002C2FF
+    BLD_INF_RULES.prj_exports += "rom/cpwepui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwepui.iby)"
+}
+symbian { 
+    deploy.path = C:
+    qtplugins.path = /resource/qt/plugins/controlpanel/wlansecurity
+    qtplugins.sources += qmakepluginstubs/cpwepui.qtplugin
+    
+    # This is for new exporting system coming in garden
+    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+}
+
+# Temporary solution to fix tracecompiler
+# When tracecompiler is fixed, this can be removed
+symbian: {
+    MMP_RULES += "USERINCLUDE traces"
+}
+
+# temporary not used; waiting for the latest .ts file ; accordingly export will change
+# translation file temporarily read as qt resource
+# TRANSLATIONS += /resource/qtwlan_en_GB.ts
+
+RESOURCES += resources/resource.qrc
+
+
+TARGET.CAPABILITY = CAP_GENERAL_DLL
+plugin.sources += cpwepui.dll
+plugin.path = /resource/qt/plugins/controlpanel
+DEPLOYMENT += plugin
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/inc/cpwepui.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Control Panel QT UI for WEP configuration
+ *
+ */
+
+/*
+ * %version: 13 %
+ */
+
+#ifndef CPWEPUI_H
+#define CPWEPUI_H
+
+// System includes
+#include <cpsettingformitemdata.h>
+#include <QStringList>
+#include <HbMessageBox>
+//#include <HbTranslator>
+//#include <QSharedPointer>
+#include <QTranslator>
+
+//User Includes
+#include "cpwlansecurityplugininterface.h"
+#include "wlansecuritycontrolpanelwepdefs.h"
+#include "wepkeyvalidator.h"
+
+// Forward declarations
+class QTranslator;
+class CmConnectionMethodShim;
+class CpWepKeyValidation;
+/*!
+ * @addtogroup group_wlan_security_ui_plugin_wep
+ * @{
+ */
+
+/*! 
+ * Implements WEP plugin for Wlan security control panel  
+ */
+
+// Class declaration
+class CpWepUi : public QObject, public CpWlanSecurityPluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(CpWlanSecurityPluginInterface)
+
+public:
+    CpWepUi();
+    ~CpWepUi();
+
+public:
+    // from CpWlanSecurityPluginInterface 
+
+    CMManagerShim::WlanSecMode securityMode() const;
+
+    QString securityModeTextId() const;
+    
+    void setReference(CmConnectionMethodShim *cmCm, uint id);
+    
+    int orderNumber() const;
+    
+    CpSettingFormItemData* uiInstance(CpItemDataHelper &dataHelper);
+
+public:
+
+    enum WEPKeyFormat
+        {
+        EFormatHex, EFormatAscii,
+        };
+
+private:
+
+    void loadFieldsFromDataBase();
+
+    void wepKeyTextChanged(int index);
+
+    bool tryUpdate();
+
+    void handleUpdateError();
+
+    void showMessageBox(HbMessageBox::MessageBoxType type,
+            const QString &text);
+
+    void updateWepSettings();
+
+    void commitWEPkeys(int index);
+    
+    void createWEPKeyOneGroup(CpItemDataHelper &dataHelpper);
+    
+    void createWEPKeyTwoGroup(CpItemDataHelper &dataHelpper);
+    
+    void createWEPKeyThreeGroup(CpItemDataHelper &dataHelpper);
+    
+    void createWEPKeyFourGroup(CpItemDataHelper &dataHelpper); 
+    
+    void storeWEPKey(CMManagerShim::ConnectionMethodAttribute enumValue,QString& key);
+    
+    void setKeyFormat(QString& key,int index);
+        
+    CMManagerShim::ConnectionMethodAttribute getWEPKeyEnum(int index);
+    
+private slots:
+
+    void wepKeyInUseChanged(int index);
+
+    void wepKeyOneChanged();
+
+    void wepKeyTwoChanged();
+
+    void wepKeyThreeChanged();
+
+    void wepKeyFourChanged();
+
+private:
+
+    Q_DISABLE_COPY(CpWepUi)
+
+    //!WEP security group item
+    CpSettingFormItemData* mUi;
+
+    //! Store strings of WEP keys
+    QStringList mKeyData;
+
+    //! WEP keys item
+    CpSettingFormItemData *mWepKey[KMaxNumberofKeys];
+
+    //! WEP keys text item
+    CpSettingFormItemData *mWepKeyText[KMaxNumberofKeys];
+
+    //!Store the index of the current key in use   
+    int mNewKeySelected;
+
+    //QSharedPointer<HbTranslator> mTranslator;
+    QTranslator* mTranslator;
+
+    //! Connection Settings Shim connection method pointer
+    CmConnectionMethodShim *mCmCM;
+
+    //! Connection method Id
+    int mCmId;
+
+    //! Message box for info notes
+    QSharedPointer<HbMessageBox> mMessageBox;
+
+    //! Store Formats of WEP keys
+    WEPKeyFormat mkeyFormat[KMaxNumberofKeys];
+    
+    
+
+};
+
+/*! @} */
+
+#endif //CPWEPUI_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/inc/wepkeyvalidator.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   Validation methods for WEP keys
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#ifndef WEPKEYVALIDATOR_H
+#define WEPKEYVALIDATOR_H
+
+/*!
+ * @addtogroup group_wep_key_validator
+ * @{
+ */
+
+class WepKeyValidator
+{
+public:
+    enum KeyStatus
+    {
+        KeyStatusOk,
+        KeyStatusIllegalCharacters,
+        KeyStatusWepInvalidLength,
+    };
+
+
+    static const int WepHex64BitMaxLength = 10;
+    static const int WepHex128BitMaxLength = 26;
+    static const int WepAscii64BitMaxLength = 5;
+    static const int WepAscii128BitMaxLength = 13;
+    static const int WepKeyEmptyString = 0;
+    
+public:
+    static KeyStatus validateWepKey(const QString &key);
+    static KeyStatus isAscii(const QString &key);
+    static KeyStatus isHex(const QString &key);
+};
+
+/*! @} */
+
+#endif /* WEPKEYVALIDATOR_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/inc/wlansecuritycontrolpanelwepdefs.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,38 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*    Control Panel QT UI for WEP configuration definitions
+*
+*/
+
+#ifndef WLANSECURITYCONTROLPANELWEPDEFS_H_
+#define WLANSECURITYCONTROLPANELWEPDEFS_H_
+
+
+//! Index of first WEP key
+static const int KFirstKey = 0;
+
+//! Index of second WEP key
+static const int KSecondKey = 1;
+
+//! Index of third WEP key
+static const int KThirdKey = 2;
+
+//! Index of fourth WEP key
+static const int KFourthKey = 3;
+
+//Maximum Number of Keys for WEP
+static const int KMaxNumberofKeys =  4;
+
+#endif /* WLANSECURITYCONTROLPANELWEPDEFS_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/resources/resource.qrc	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/loc" >
+        <file>wlan_en_GB.qm</file>
+    </qresource>
+</RCC>
Binary file securitysettings/cpwlansecurityuiplugins/cpwepui/resources/wlan_en_GB.qm has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/resources/wlan_en_GB.ts	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,4052 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="3.0" language="en_GB" sourcelanguage="en_GB">
+<context>
+<message numerus="no" id="txt_occ_dblist_destination">
+    <comment>Title for destination summary item</comment>        
+    <source>Destination</source>
+    <translation variants="no">Destination</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_add_apn">
+    <comment></comment>        
+    <source>Add APN</source>
+    <translation variants="no">Add APN</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_phone_ip_address">
+    <comment>Setting label. IP address for the phone.</comment>        
+    <source>Phone IP address</source>
+    <translation variants="no">Phone IP address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_17</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode">
+    <comment>Title for network mode summary item</comment>        
+    <source>Network mode</source>
+    <translation variants="no">Network mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_realm_val_generate_automatically">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_54_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv0">
+    <comment></comment>        
+    <source>PEAPv0</source>
+    <translation variants="no">PEAPv0</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_medium_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Medium (%L1%)</source>
+    <translation variants="no">Medium (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wireless_lan">
+    <comment></comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_titlebar</extra-loc-layout_id>    
+    <extra-loc-viewid>occ</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_forget_network">
+    <comment></comment>        
+    <source>Forget network</source>
+    <translation variants="no">Forget network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_settings_2</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_cipher_suites">
+    <comment></comment>        
+    <source>Cipher suites</source>
+    <translation variants="no">Cipher suites</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsa3dessha">
+    <comment></comment>        
+    <source>RSA,3DES,SHA</source>
+    <translation variants="no">RSA,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhersa3dessha">
+    <comment></comment>        
+    <source>DHE-RSA,3DES,SHA</source>
+    <translation variants="no">DHE-RSA,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_downloads">
+    <comment></comment>        
+    <source>Downloads</source>
+    <translation variants="no">Downloads</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_configuration_failed">
+    <comment></comment>        
+    <source>Configuration failed</source>
+    <translation variants="no">Configuration failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_java_app">
+    <comment></comment>        
+    <source>Java app.</source>
+    <translation variants="no">Java app.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_low_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Low (%L1%)</source>
+    <translation variants="no">Low (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_unencrypted_connection_val_allowe">
+    <comment></comment>        
+    <source>Allowed</source>
+    <translation variants="no">Allowed</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_62_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_128bit_key">
+    <comment></comment>        
+    <source>128-bit key</source>
+    <translation variants="no">128-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_wlan_only">
+    <comment></comment>        
+    <source>WLAN only</source>
+    <translation variants="no">WLAN only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_adhoc">
+    <comment></comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks_val_userdefine">
+    <comment></comment>        
+    <source>User-defined interval</source>
+    <translation variants="no">User-defined interval</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate">
+    <comment></comment>        
+    <source>Authority certificate</source>
+    <translation variants="no">Authority certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_33</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_cellular_cancel">
+    <comment>Cancel connection establishment.</comment>        
+    <source>Cancel</source>
+    <translation variants="no">Cancel</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_adhoc">
+    <comment>Network mode summary item: Ad-hoc</comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_client_certificate">
+    <comment></comment>        
+    <source>WAPI client certificate</source>
+    <translation variants="no">WAPI client certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_37</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_intranet">
+    <comment></comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_3">
+    <comment></comment>        
+    <source>WEP key #3</source>
+    <translation variants="no">WEP key #3</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_authority_certificate">
+    <comment></comment>        
+    <source>Select authority certificate:</source>
+    <translation variants="no">Select authority certificate:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_02</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name_val_vpn">
+    <comment>Setting value. Default name for VPN access point in case no name defined by user.</comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_on_hold">
+    <comment>Value for detail in details view.</comment>        
+    <source>On hold</source>
+    <translation variants="no">On hold</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_delete_snap">
+    <comment>Confirmation dialog. Confirms the deletion of a destination. %1 is the name of the destination, does not need localisation.</comment>        
+    <source>Delete &apos;%1&apos;?</source>
+    <translation variants="no">Delete &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_delete_snap</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_delete_vpn_policy">
+    <comment></comment>        
+    <source>Delete &apos;%1&apos;?</source>
+    <translation variants="no">Delete &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_delete_policy</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status">
+    <comment>Setting label. WLAN network status.</comment>        
+    <source>Network status</source>
+    <translation variants="no">Network status</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_speed">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Speed</source>
+    <translation variants="no">Speed</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_kb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 kB</source>
+    <translation variants="no">%1 kB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_activate_restrictions">
+    <comment></comment>        
+    <source>Activate restrictions</source>
+    <translation variants="no">Activate restrictions</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_connection_details">
+    <comment></comment>        
+    <source>Connection details</source>
+    <translation variants="no">Connection details</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_off">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is off.</comment>        
+    <source>WLAN is off</source>
+    <translation variants="no">WLAN is off</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_arrange">
+    <comment>View specific menu item. Sets the view to Arrange mode where drag-and-drop can be used to re-prioritise access points.</comment>        
+    <source>Arrange</source>
+    <translation variants="no">Arrange</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_realm">
+    <comment></comment>        
+    <source>Realm</source>
+    <translation variants="no">Realm</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_41</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_select_network_mode_and_status">
+    <comment></comment>        
+    <source>Select network mode (and status):</source>
+    <translation variants="no">Select network mode (and status):</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>dialog_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_server_address">
+    <comment>Setting label. Proxy server address (URI or IP address).</comment>        
+    <source>Proxy server address</source>
+    <translation variants="no">Proxy server address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_19</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wpawpa2">
+    <comment>Setting value. WLAN uses WPA/WPA2 security.</comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_select_network_security_mode">
+    <comment></comment>        
+    <source>Select network security mode:</source>
+    <translation variants="no">Select network security mode:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>dialog_7</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_no_certificates_found">
+    <comment></comment>        
+    <source>No certificates found</source>
+    <translation variants="no">No certificates found</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_01</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_internet_val_no_access_points">
+    <comment>List item, 2-row, secondary text. No access points defined in the destination in question.</comment>        
+    <source>No access points</source>
+    <translation variants="no">No access points</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2_3_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_wellknown">
+    <comment>Setting value. DNS addresses are well-known (standard-defined fixed addresses).</comment>        
+    <source>Well-known</source>
+    <translation variants="no">Well-known</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_infrastructure_public">
+    <comment></comment>        
+    <source>Public</source>
+    <translation variants="no">Public</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_show_unknown_networks">
+    <comment></comment>        
+    <source>Show unknown networks</source>
+    <translation variants="no">Show unknown networks</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_next">
+    <comment>Next toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Next</source>
+    <translation variants="no">Next</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_use">
+    <comment></comment>        
+    <source>WEP key in use</source>
+    <translation variants="no">WEP key in use</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_connection">
+    <comment></comment>        
+    <source>Select connection:</source>
+    <translation variants="no">Select connection:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_secondary_name_server">
+    <comment>Setting label. Secondary domain name server&apos;s (DNS) address.</comment>        
+    <source>Secondary name server</source>
+    <translation variants="no">Secondary name server</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_24</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving">
+    <comment></comment>        
+    <source>Power saving</source>
+    <translation variants="no">Power saving</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_connected_to_1">
+    <comment>Custom layout ID parent. Status of WLAN in WLAN list view. WLAN is on, and connected to access point name &apos;%1&apos;.</comment>        
+    <source>Connected to &apos;%1&apos;</source>
+    <translation variants="no">Connected to &apos;%1&apos;</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_notifications">
+    <comment></comment>        
+    <source>Notifications</source>
+    <translation variants="no">Notifications</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_42</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_total">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Total</source>
+    <translation variants="no">Total</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_duration">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Duration</source>
+    <translation variants="no">Duration</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_there_is_a_mismatch_between_the_selec">
+    <comment></comment>        
+    <source>There is a mismatch between the selected certificate and the certificate sent by server. Please verify certificate settings.</source>
+    <translation variants="no">There is a mismatch between the selected certificate and the certificate sent by server. Please verify certificate settings.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_eap_identity_for_1">
+    <comment></comment>        
+    <source>EAP identity for &apos;%1&apos;:</source>
+    <translation variants="no">EAP identity for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapsim_settings">
+    <comment></comment>        
+    <source>EAP-SIM settings</source>
+    <translation variants="no">EAP-SIM settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapfast_settings">
+    <comment></comment>        
+    <source>EAP-FAST settings</source>
+    <translation variants="no">EAP-FAST settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_subnet_mask">
+    <comment>Setting label.Subnet mask is used to define the IP address prefix common to all the devices in the subnet.</comment>        
+    <source>Subnet mask</source>
+    <translation variants="no">Subnet mask</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_21</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_unauthenticated_provisioning">
+    <comment></comment>        
+    <source>Unauthenticated provisioning</source>
+    <translation variants="no">Unauthenticated provisioning</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name">
+    <comment></comment>        
+    <source>User name</source>
+    <translation variants="no">User name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_40</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_destination_val_internet">
+    <comment>TODO: to be removed</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_port_number">
+    <comment>Setting label. Proxy server port number</comment>        
+    <source>Proxy port number</source>
+    <translation variants="no">Proxy port number</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_20</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapttls_settings">
+    <comment></comment>        
+    <source>EAP-TTLS settings</source>
+    <translation variants="no">EAP-TTLS settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wep">
+    <comment>Security mode summary item: WEP</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wpawpa2psk">
+    <comment>Security mode summary item: WPA with password</comment>        
+    <source>WPA with password</source>
+    <translation variants="no">WPA with password</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_known_wlan_networks">
+    <comment></comment>        
+    <source>Known WLAN networks</source>
+    <translation variants="no">Known WLAN networks</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_user_name">
+    <comment></comment>        
+    <source>User name:</source>
+    <translation variants="no">User name:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_53</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_wlan_is_on">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is on, but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapaka_settings">
+    <comment></comment>        
+    <source>EAP-AKA settings</source>
+    <translation variants="no">EAP-AKA settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_not_connected">
+    <comment>Indicator menu WLAN plugin value, WLAN on but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name">
+    <comment>Setting label. User-defined name for internet access point.</comment>        
+    <source>Connection name</source>
+    <translation variants="no">Connection name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_disconnecting">
+    <comment>Status of WLAN in WLAN list view. WLAN connection is being disconnected.</comment>        
+    <source>Disconnecting</source>
+    <translation variants="no">Disconnecting</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_homepage">
+    <comment>Setting label. Homepage for the internet access point.</comment>        
+    <source>Homepage</source>
+    <translation variants="no">Homepage</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_4">
+    <comment></comment>        
+    <source>#4</source>
+    <translation variants="no">#4</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_status_verified">
+    <comment></comment>        
+    <source>Status: verified</source>
+    <translation variants="no">Status: verified</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_check_connection_settings">
+    <comment></comment>        
+    <source>Check connection settings</source>
+    <translation variants="no">Check connection settings</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_switch_wlan_on">
+    <comment></comment>        
+    <source>Switch WLAN on</source>
+    <translation variants="no">Switch WLAN on</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wlan_settings">
+    <comment></comment>        
+    <source>WLAN settings</source>
+    <translation variants="no">WLAN settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode">
+    <comment>Setting label. WLAN network&apos;s security mode.</comment>        
+    <source>WLAN security mode</source>
+    <translation variants="no">WLAN security mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsarc4md5">
+    <comment></comment>        
+    <source>RSA,RC4,MD5</source>
+    <translation variants="no">RSA,RC4,MD5</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_good_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Good (%L1%)</source>
+    <translation variants="no">Good (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv1">
+    <comment></comment>        
+    <source>PEAPv1</source>
+    <translation variants="no">PEAPv1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_infrastructure_hidden">
+    <comment></comment>        
+    <source>Hidden</source>
+    <translation variants="no">Hidden</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_destinations_access_points">
+    <comment>Groupbox title. Destinations and access point settings.</comment>        
+    <source>Destinations &amp; access points</source>
+    <translation variants="no">Destinations &amp; access points</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_bearer">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Bearer</source>
+    <translation variants="no">Bearer</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wlan_setup_wizard_step_l1">
+    <comment>Heading for WLAN wizard</comment>        
+    <source>WLAN setup wizard, step %L1</source>
+    <translation variants="no">WLAN setup wizard, step %L1</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_details">
+    <comment>Item specific menu item. Opens a view where user can see the details for a WLAN network.</comment>        
+    <source>Details</source>
+    <translation variants="no">Details</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_reset_pac_store">
+    <comment></comment>        
+    <source>Reset PAC store</source>
+    <translation variants="no">Reset PAC store</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhersaaessha">
+    <comment></comment>        
+    <source>DHE-RSA,AES,SHA</source>
+    <translation variants="no">DHE-RSA,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy">
+    <comment></comment>        
+    <source>TLS privacy</source>
+    <translation variants="no">TLS privacy</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status_val_public">
+    <comment>Setting value. WLAN network is public (not hidden).</comment>        
+    <source>Public</source>
+    <translation variants="no">Public</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_gb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 GB</source>
+    <translation variants="no">%1 GB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_known_ne">
+    <comment></comment>        
+    <source>Known &amp; new</source>
+    <translation variants="no">Known &amp; new</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_confirm">
+    <comment></comment>        
+    <source>Confirm</source>
+    <translation variants="no">Confirm</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn_val_always">
+    <comment></comment>        
+    <source>Always</source>
+    <translation variants="no">Always</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_incomplete_details_return_without_sa">
+    <comment></comment>        
+    <source>Incomplete details. Return without saving?</source>
+    <translation variants="no">Incomplete details. Return without saving?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_02</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_adhoc_1">
+    <comment></comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_dedicated_access_point">
+    <comment></comment>        
+    <source>Dedicated access point</source>
+    <translation variants="no">Dedicated access point</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv0_or_peapv1">
+    <comment></comment>        
+    <source>PEAPv0 or PEAPv1</source>
+    <translation variants="no">PEAPv0 or PEAPv1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_via_1">
+    <comment></comment>        
+    <source>Via &apos;%1&apos;</source>
+    <translation variants="no">Via &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connecting</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_downloading_vpn_policy">
+    <comment></comment>        
+    <source>Downloading VPN policy</source>
+    <translation variants="no">Downloading VPN policy</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_policy_dl</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_2">
+    <comment></comment>        
+    <source>WEP key #2</source>
+    <translation variants="no">WEP key #2</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_realm">
+    <comment></comment>        
+    <source>Realm:</source>
+    <translation variants="no">Realm:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_54</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy_val_on">
+    <comment></comment>        
+    <source>On</source>
+    <translation variants="no">On</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format">
+    <comment></comment>        
+    <source>WEP key format</source>
+    <translation variants="no">WEP key format</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_pac_store">
+    <comment></comment>        
+    <source>PAC store</source>
+    <translation variants="no">PAC store</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access_val_enab">
+    <comment></comment>        
+    <source>Enabled</source>
+    <translation variants="no">Enabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_val_stay_in_fir">
+    <comment>Setting value. Device stays connected to the access point initially selected.</comment>        
+    <source>Stay in first</source>
+    <translation variants="no">Stay in first</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_download_failed">
+    <comment></comment>        
+    <source>Download failed</source>
+    <translation variants="no">Download failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_error_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy_val_off">
+    <comment></comment>        
+    <source>Off</source>
+    <translation variants="no">Off</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_outer_eap">
+    <comment></comment>        
+    <source>Outer EAP</source>
+    <translation variants="no">Outer EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpa_with_eap">
+    <comment></comment>        
+    <source>WPA with EAP</source>
+    <translation variants="no">WPA with EAP</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_received">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Received</source>
+    <translation variants="no">Received</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_certificate_val_not_in_use">
+    <comment></comment>        
+    <source>(not in use)</source>
+    <translation variants="no">(not in use)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_45_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_reject">
+    <comment></comment>        
+    <source>Reject</source>
+    <translation variants="no">Reject</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_operator_services">
+    <comment></comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_operator_services">
+    <comment>List item, 2-row, primary text. Name of the Operator services destination.</comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode">
+    <comment>Title for security mode summary item.</comment>        
+    <source>Security mode</source>
+    <translation variants="no">Security mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_mschapv2_settings">
+    <comment></comment>        
+    <source>MSCHAPv2 settings</source>
+    <translation variants="no">MSCHAPv2 settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn_val_when_needed">
+    <comment></comment>        
+    <source>When needed</source>
+    <translation variants="no">When needed</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_confirm_password">
+    <comment></comment>        
+    <source>Confirm password:</source>
+    <translation variants="no">Confirm password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_07</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_58</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data">
+    <comment></comment>        
+    <source>Cellular data</source>
+    <translation variants="no">Cellular data</translation>
+    <extra-loc-layout_id>qtl_indimenu_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dedicated_access_point">
+    <comment></comment>        
+    <source>Dedicated access point</source>
+    <translation variants="no">Dedicated access point</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_selection">
+    <comment>Setting label. Defines whether the device automatically roams to best signal strength WLAN access point between WLAN access points (base stations) having the same WLAN network name (SSID), or if it stays connected to the access point it initially selected.</comment>        
+    <source>WLAN base station selection</source>
+    <translation variants="no">WLAN base station selection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_inner_eap_type">
+    <comment></comment>        
+    <source>Configure inner EAP type</source>
+    <translation variants="no">Configure inner EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_1_connected">
+    <comment>Indicator menu WLAN plugin value, WLAN connected to access point %1 (parameter not localised).</comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_ip_address">
+    <comment>Heading for detail in details view.</comment>        
+    <source>IP address</source>
+    <translation variants="no">IP address</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_enter_access_pt_name_or_leave_blan">
+    <comment></comment>        
+    <source>Enter access pt. name or leave blank and press &apos;OK&apos; to add operator default:</source>
+    <translation variants="no">Enter access pt. name or leave blank and press &apos;OK&apos; to add operator default:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_acl_add_apn</extra-loc-viewid>
+    <extra-loc-positionid>dialog_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode_val_unauthentic">
+    <comment></comment>        
+    <source>Unauthenticated</source>
+    <translation variants="no">Unauthenticated</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status_val_hidden">
+    <comment>Setting value. WLAN network is hidden.</comment>        
+    <source>Hidden</source>
+    <translation variants="no">Hidden</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_tx_power">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Tx power</source>
+    <translation variants="no">Tx power</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_home_network">
+    <comment></comment>        
+    <source>Data usage in home network</source>
+    <translation variants="no">Data usage in home network</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_apn">
+    <comment>Heading for detail in details view.</comment>        
+    <source>APN</source>
+    <translation variants="no">APN</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_256bit_key">
+    <comment></comment>        
+    <source>256-bit key</source>
+    <translation variants="no">256-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_default_gateway">
+    <comment>Setting label. Default gateway defines the IP address of the router in a network using subnets.</comment>        
+    <source>Default gateway</source>
+    <translation variants="no">Default gateway</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_22</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpa_with_password">
+    <comment></comment>        
+    <source>WPA with password</source>
+    <translation variants="no">WPA with password</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_wlan_to_be_used_instead_of_ce">
+    <comment></comment>        
+    <source>Select WLAN to be used instead of cellular data.</source>
+    <translation variants="no">Select WLAN to be used instead of cellular data.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_settings_received_for_multiple_ne">
+    <comment></comment>        
+    <source>Settings received for multiple networks</source>
+    <translation variants="no">Settings received for multiple networks</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_access_point">
+    <comment></comment>        
+    <source>Access point</source>
+    <translation variants="no">Access point</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_9</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_signal_too_weak">
+    <comment></comment>        
+    <source>Signal too weak </source>
+    <translation variants="no">Signal too weak </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_issuer_1">
+    <comment></comment>        
+    <source>Issuer: &apos;%1&apos;</source>
+    <translation variants="no">Issuer: &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_certificate">
+    <comment></comment>        
+    <source>Certificate</source>
+    <translation variants="no">Certificate</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode_val_authenticat">
+    <comment></comment>        
+    <source>Authenticated</source>
+    <translation variants="no">Authenticated</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eaptls_settings">
+    <comment></comment>        
+    <source>EAP-TLS settings</source>
+    <translation variants="no">EAP-TLS settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_ssid">
+    <comment>Heading for detail in details view.</comment>        
+    <source>SSID</source>
+    <translation variants="no">SSID</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_name">
+    <comment>Custom layout ID parent. Title for network name summary item</comment>        
+    <source>Network name</source>
+    <translation variants="no">Network name</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_9</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_settings">
+    <comment></comment>        
+    <source>Network settings</source>
+    <translation variants="no">Network settings</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_19</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_mb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 MB</source>
+    <translation variants="no">%1 MB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password">
+    <comment></comment>        
+    <source>PAC store password</source>
+    <translation variants="no">PAC store password</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_secondary_dns">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Secondary DNS</source>
+    <translation variants="no">Secondary DNS</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_network_connection">
+    <comment></comment>        
+    <source>Network connection</source>
+    <translation variants="no">Network connection</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_primary_name_server_val_automatic">
+    <comment>Setting value. Primary DNS address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_23_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_connect_this_time">
+    <comment>Allow connection this time. Will prompt again next time.</comment>        
+    <source>Connect this time</source>
+    <translation variants="no">Connect this time</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_val_generate_automatic">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_53_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_manual">
+    <comment></comment>        
+    <source>Manual</source>
+    <translation variants="no">Manual</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_packet_data">
+    <comment>Value for detail in details view.</comment>        
+    <source>Packet data</source>
+    <translation variants="no">Packet data</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_previous">
+    <comment>Previous toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Previous</source>
+    <translation variants="no">Previous</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_eapfast">
+    <comment></comment>        
+    <source>EAP-FAST provisioning mode</source>
+    <translation variants="no">EAP-FAST provisioning mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_wlan_only">
+    <comment></comment>        
+    <source>WLAN only</source>
+    <translation variants="no">WLAN only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password_val_prompt">
+    <comment></comment>        
+    <source>Prompt</source>
+    <translation variants="no">Prompt</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_infrastructure_hi">
+    <comment></comment>        
+    <source>Infrastructure (hidden)</source>
+    <translation variants="no">Infrastructure (hidden)</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_notifications_val_show">
+    <comment></comment>        
+    <source>Show</source>
+    <translation variants="no">Show</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_42_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_show_all">
+    <comment></comment>        
+    <source>Show all...</source>
+    <translation variants="no">Show all...</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_network_settings">
+    <comment>Item specific menu item. Opens the access point settings view for the WLAN network.</comment>        
+    <source>Network settings</source>
+    <translation variants="no">Network settings</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_connected_to_1">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is connected to access point name &apos;%1&apos;.</comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access_val_disa">
+    <comment></comment>        
+    <source>Disabled</source>
+    <translation variants="no">Disabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format_val_hexadecimal">
+    <comment></comment>        
+    <source>Hexadecimal</source>
+    <translation variants="no">Hexadecimal</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_operator_services">
+    <comment></comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_innear_eap_type_for_1">
+    <comment></comment>        
+    <source>Select innear EAP type for &apos;%1&apos;:</source>
+    <translation variants="no">Select innear EAP type for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_04</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_1">
+    <comment></comment>        
+    <source>#1</source>
+    <translation variants="no">#1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses">
+    <comment>Setting label. Domain name servers&apos; (DNS) IP addresses.</comment>        
+    <source>DNS addresses</source>
+    <translation variants="no">DNS addresses</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_please_try_again">
+    <comment></comment>        
+    <source>Please try again </source>
+    <translation variants="no">Please try again </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan">
+    <comment>List item, 2-row, primary text. Name of the WLAN plug-in under Control Panel&apos;s &quot;Connectivity&quot; group.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapgtc_settings">
+    <comment></comment>        
+    <source>EAP-GTC settings</source>
+    <translation variants="no">EAP-GTC settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="yes" id="txt_occ_list_lnd_2">
+    <comment>Value for detail in details view.</comment>        
+    <source>%Lnd %2</source>
+    <translation>
+        <numerusform variants="no">(s)%Lnd %2</numerusform>
+        <numerusform variants="no">(p)%Lnd %2</numerusform>
+    </translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_8021x">
+    <comment>Setting value. WLAN uses 802.1X security.</comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_connection_unavailable">
+    <comment></comment>        
+    <source>Connection unavailable</source>
+    <translation variants="no">Connection unavailable</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_wlan_network_not_found">
+    <comment></comment>        
+    <source>WLAN network not found</source>
+    <translation variants="no">WLAN network not found</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_8021x_1">
+    <comment></comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_status_not_verified">
+    <comment></comment>        
+    <source>Status: not verified</source>
+    <translation variants="no">Status: not verified</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_download">
+    <comment></comment>        
+    <source>Download</source>
+    <translation variants="no">Download</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_unknown">
+    <comment></comment>        
+    <source>(unknown)</source>
+    <translation variants="no">(unknown)</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpawpa2">
+    <comment>Value for detail in details view.</comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_preshared_key_format">
+    <comment></comment>        
+    <source>Pre-shared key format</source>
+    <translation variants="no">Pre-shared key format</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_connecting">
+    <comment></comment>        
+    <source>Connecting</source>
+    <translation variants="no">Connecting</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connecting</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_realm_val_generate_automatically">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_41_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_open">
+    <comment>Setting value. WLAN network is open, no security.</comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_eap_type_settings">
+    <comment></comment>        
+    <source>EAP type settings</source>
+    <translation variants="no">EAP type settings</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_access_point_settings">
+    <comment>Groupbox title. Internet access point settings group.</comment>        
+    <source>Access point settings</source>
+    <translation variants="no">Access point settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name_val_connection">
+    <comment>Setting value. Default name for internet access point in case no name defined by user.</comment>        
+    <source>Connection</source>
+    <translation variants="no">Connection</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_connection_already_active">
+    <comment></comment>        
+    <source>Connection already active</source>
+    <translation variants="no">Connection already active</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_roaming">
+    <comment></comment>        
+    <source>Data usage when roaming</source>
+    <translation variants="no">Data usage when roaming</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version">
+    <comment></comment>        
+    <source>PEAP version</source>
+    <translation variants="no">PEAP version</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_dont_show_again">
+    <comment></comment>        
+    <source>Don&apos;t show again</source>
+    <translation variants="no">Don&apos;t show again</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_creating_connection">
+    <comment>Value for detail in details view.</comment>        
+    <source>Creating connection</source>
+    <translation variants="no">Creating connection</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode_val_infrastruct">
+    <comment>Setting value. WLAN network is based on WLAN base station, i.e. infrastructure.</comment>        
+    <source>Infrastructure</source>
+    <translation variants="no">Infrastructure</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_deactivate_restrictions">
+    <comment></comment>        
+    <source>Deactivate restrictions</source>
+    <translation variants="no">Deactivate restrictions</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_operator_services">
+    <comment>Simple label (groupbox). Name of the Operator services destination.</comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_accept">
+    <comment></comment>        
+    <source>Accept</source>
+    <translation variants="no">Accept</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2_val_eap">
+    <comment></comment>        
+    <source>EAP</source>
+    <translation variants="no">EAP</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_network">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Network</source>
+    <translation variants="no">Network</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_default_gateway_val_not_defined">
+    <comment>Setting value. Default gateway not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_22_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_activate_wlan_in_airplane_mode">
+    <comment></comment>        
+    <source>Activate WLAN in airplane mode?</source>
+    <translation variants="no">Activate WLAN in airplane mode?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_offline_mode_query</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2_val_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_64bit_key">
+    <comment></comment>        
+    <source>64-bit key</source>
+    <translation variants="no">64-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_eap_type">
+    <comment></comment>        
+    <source>Select EAP type:</source>
+    <translation variants="no">Select EAP type:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_01</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_service_not_available">
+    <comment></comment>        
+    <source>Service not available</source>
+    <translation variants="no">Service not available</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_error_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_type">
+    <comment></comment>        
+    <source>EAP type</source>
+    <translation variants="no">EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_35</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_use_only_known_networks">
+    <comment></comment>        
+    <source>Use only known networks</source>
+    <translation variants="no">Use only known networks</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_proxy_settings">
+    <comment>Groupbox title. Proxy server settings group.</comment>        
+    <source>Proxy settings</source>
+    <translation variants="no">Proxy settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_closing_connection">
+    <comment>Value for detail in details view.</comment>        
+    <source>Closing connection</source>
+    <translation variants="no">Closing connection</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type">
+    <comment></comment>        
+    <source>Authentication type</source>
+    <translation variants="no">Authentication type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_destination_name">
+    <comment>Input dialog. Name for a new destination.</comment>        
+    <source>Destination name:</source>
+    <translation variants="no">Destination name:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_snap</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_l1_b">
+    <comment>Value for detail in details view.</comment>        
+    <source>%L1 B</source>
+    <translation variants="no">%L1 B</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_connect_automatically">
+    <comment>Allow connecting automatically now and later (will change the appropriate setting under Control Panel).</comment>        
+    <source>Connect automatically</source>
+    <translation variants="no">Connect automatically</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_root_cert_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_38_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_permission_denied">
+    <comment></comment>        
+    <source>Permission denied </source>
+    <translation variants="no">Permission denied </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_service_unreachable">
+    <comment></comment>        
+    <source>Service unreachable</source>
+    <translation variants="no">Service unreachable</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wep_1">
+    <comment></comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection_val_automa">
+    <comment></comment>        
+    <source>Automatically</source>
+    <translation variants="no">Automatically</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsaaessha">
+    <comment></comment>        
+    <source>RSA,AES,SHA</source>
+    <translation variants="no">RSA,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapleap_settings">
+    <comment></comment>        
+    <source>EAP-LEAP settings</source>
+    <translation variants="no">EAP-LEAP settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection_val_when_n">
+    <comment></comment>        
+    <source>When needed</source>
+    <translation variants="no">When needed</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsarc4sha">
+    <comment></comment>        
+    <source>RSA,RC4,SHA</source>
+    <translation variants="no">RSA,RC4,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_connect_to_internet_using_cellular_d">
+    <comment>Confirmation dialog text. A cellular data connection is tried to be established (in home network). This may generate costs. User can accept the connection to be established automatically (will change appropriate setting value in Control Panel), only this time (will prompt again next time) or cancel the connection.</comment>        
+    <source>Connect to Internet using cellular data? Data costs may apply.</source>
+    <translation variants="no">Connect to Internet using cellular data? Data costs may apply.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular_home</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data_val_1_connected">
+    <comment></comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_there_are_no_certificates_installed">
+    <comment></comment>        
+    <source>There are no certificates installed. Wizard cannot continue with selected EAP type. Contact your administrator for assistance.</source>
+    <translation variants="no">There are no certificates installed. Wizard cannot continue with selected EAP type. Contact your administrator for assistance.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection">
+    <comment></comment>        
+    <source>Packet data connection</source>
+    <translation variants="no">Packet data connection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_messaging">
+    <comment></comment>        
+    <source>Messaging</source>
+    <translation variants="no">Messaging</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_infrastructure_pu">
+    <comment>Network mode summary item: Infrastructure (public)</comment>        
+    <source>Infrastructure (public)</source>
+    <translation variants="no">Infrastructure (public)</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_security">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Security</source>
+    <translation variants="no">Security</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_confirm">
+    <comment></comment>        
+    <source>Confirm</source>
+    <translation variants="no">Confirm</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_cellular_data_usage">
+    <comment></comment>        
+    <source>Cellular data usage</source>
+    <translation variants="no">Cellular data usage</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_configure_manually">
+    <comment></comment>        
+    <source>Configure manually</source>
+    <translation variants="no">Configure manually</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_gateway">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Gateway</source>
+    <translation variants="no">Gateway</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_wep_key">
+    <comment></comment>        
+    <source>Invalid WEP key</source>
+    <translation variants="no">Invalid WEP key</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wlan_setup_wizard_summary">
+    <comment>Heading for WLAN wizard, summary page</comment>        
+    <source>WLAN setup wizard, summary</source>
+    <translation variants="no">WLAN setup wizard, summary</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_primary_name_server">
+    <comment>Setting label. Primary domain name server&apos;s (DNS) address.</comment>        
+    <source>Primary name server</source>
+    <translation variants="no">Primary name server</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_23</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access">
+    <comment></comment>        
+    <source>High-speed packet access</source>
+    <translation variants="no">High-speed packet access</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_kbs">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 kB/s</source>
+    <translation variants="no">%1 kB/s</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_pac_store_password">
+    <comment></comment>        
+    <source>PAC store password:</source>
+    <translation variants="no">PAC store password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_08</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_59</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_homepage_val_none">
+    <comment>Setting value. Homepage has not been defined.</comment>        
+    <source>None</source>
+    <translation variants="no">None</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_16_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_packet_data">
+    <comment></comment>        
+    <source>Packet data</source>
+    <translation variants="no">Packet data</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks">
+    <comment></comment>        
+    <source>Join WLAN networks</source>
+    <translation variants="no">Join WLAN networks</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_delete_apn">
+    <comment></comment>        
+    <source>Delete APN</source>
+    <translation variants="no">Delete APN</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_internet">
+    <comment></comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_known_wlan_networks">
+    <comment></comment>        
+    <source>Known WLAN networks</source>
+    <translation variants="no">Known WLAN networks</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_settings_2</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_root_certificate">
+    <comment></comment>        
+    <source>WAPI root certificate</source>
+    <translation variants="no">WAPI root certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_38</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_authentication">
+    <comment></comment>        
+    <source>WAPI authentication</source>
+    <translation variants="no">WAPI authentication</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_indi_menu_wireless_lan">
+    <comment>Indicator menu WLAN plugin title.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_indimenu_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_input">
+    <comment></comment>        
+    <source>Invalid input</source>
+    <translation variants="no">Invalid input</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_server_name_val_verify">
+    <comment></comment>        
+    <source>Verify</source>
+    <translation variants="no">Verify</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_50_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format_val_ascii">
+    <comment></comment>        
+    <source>ASCII</source>
+    <translation variants="no">ASCII</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate_val_not_in">
+    <comment></comment>        
+    <source>(not in use)</source>
+    <translation variants="no">(not in use)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_insert_the_name_of_the_new_wlan_net">
+    <comment></comment>        
+    <source>Insert the name of the new WLAN network:</source>
+    <translation variants="no">Insert the name of the new WLAN network:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_1</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type_val_open">
+    <comment></comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_vpn_policy_download">
+    <comment></comment>        
+    <source>VPN policy download</source>
+    <translation variants="no">VPN policy download</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn">
+    <comment></comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_with_the_access_point_control_servic">
+    <comment></comment>        
+    <source>With the access point control service, packet data connections from your device may be restricted to certain access points only.</source>
+    <translation variants="no">With the access point control service, packet data connections from your device may be restricted to certain access points only.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_user_certificate">
+    <comment></comment>        
+    <source>Select user certificate:</source>
+    <translation variants="no">Select user certificate:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_06</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_8021x">
+    <comment></comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_password">
+    <comment></comment>        
+    <source>Password</source>
+    <translation variants="no">Password</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_43</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving_val_enabled">
+    <comment></comment>        
+    <source>Enabled</source>
+    <translation variants="no">Enabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_internet">
+    <comment>List item, 2-row, primary text. Name of the Internet destination.</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_authenticated_provisioning">
+    <comment></comment>        
+    <source>Authenticated provisioning</source>
+    <translation variants="no">Authenticated provisioning</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_connect_to_internet_in_this_country">
+    <comment>Confirmation dialog text. A cellular data connection is tried to be established outside of home network (i.e. when roaming). This may considerably increase data costs. User can accept the connection this time or reject it. User must go to Control Panel&apos;s connection settings and adjust setting related to data usage abroadto allow automatic connections without confirmations.</comment>        
+    <source>Connect to Internet using cellular data? Phone is outside of home network, and data costs may increase considerably. To allow connecting automatically, adjust the Connection settings.</source>
+    <translation variants="no">Connect to Internet using cellular data? Phone is outside of home network, and data costs may increase considerably. To allow connecting automatically, adjust the Connection settings.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular_abroad</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_automatic">
+    <comment>Setting value. DNS addresses are fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_disable_network">
+    <comment>Item specific menu item. Disables the selected network (i.e. network is not used in automatic connection selection).</comment>        
+    <source>Disable network</source>
+    <translation variants="no">Disable network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_server_1">
+    <comment></comment>        
+    <source>Server: &apos;%1&apos;</source>
+    <translation variants="no">Server: &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_hide_unknown_networks">
+    <comment></comment>        
+    <source>Hide unknown networks</source>
+    <translation variants="no">Hide unknown networks</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_security_settings">
+    <comment></comment>        
+    <source>Security settings</source>
+    <translation variants="no">Security settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_server_name">
+    <comment></comment>        
+    <source>Server name</source>
+    <translation variants="no">Server name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_50</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_internet">
+    <comment></comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_5</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_open">
+    <comment>Custom layout ID parent. Security mode summary item: Open</comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_selected_network_supports_wifi_prote">
+    <comment></comment>        
+    <source>Selected network supports Wi-Fi Protected Setupâ„¢ for receiving settings automatically. First, press button on wireless station to initiate the setup process, then select &apos;Continue&apos;.</source>
+    <translation variants="no">Selected network supports Wi-Fi Protected Setupâ„¢ for receiving settings automatically. First, press button on wireless station to initiate the setup process, then select &apos;Continue&apos;.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_ascii">
+    <comment></comment>        
+    <source>ASCII</source>
+    <translation variants="no">ASCII</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_subnet_mask_val_not_defined">
+    <comment>Setting value. Subnet mask not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_21_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_certificate">
+    <comment></comment>        
+    <source>Certificate</source>
+    <translation variants="no">Certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_add_destination">
+    <comment>Action button. Adds a new destination.</comment>        
+    <source>Add destination</source>
+    <translation variants="no">Add destination</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_sim_card_missing">
+    <comment></comment>        
+    <source>SIM card missing </source>
+    <translation variants="no">SIM card missing </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_2">
+    <comment></comment>        
+    <source>#2</source>
+    <translation variants="no">#2</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_unencrypted_connection">
+    <comment></comment>        
+    <source>Unencrypted connection</source>
+    <translation variants="no">Unencrypted connection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_62</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_policy_server_address">
+    <comment></comment>        
+    <source>Policy server address</source>
+    <translation variants="no">Policy server address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_61</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode_val_adhoc">
+    <comment>Setting value. WLAN network is formed between two devices without a base station.</comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhedssaessha">
+    <comment></comment>        
+    <source>DHE-DSS,AES,SHA</source>
+    <translation variants="no">DHE-DSS,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type_val_shared">
+    <comment></comment>        
+    <source>Shared</source>
+    <translation variants="no">Shared</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_adhoc_channel">
+    <comment>Setting label. WLAN ad-hoc network&apos;s channel number.</comment>        
+    <source>Ad-hoc channel</source>
+    <translation variants="no">Ad-hoc channel</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_25</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_pap_settings">
+    <comment></comment>        
+    <source>PAP settings</source>
+    <translation variants="no">PAP settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks">
+    <comment></comment>        
+    <source>Scan for networks</source>
+    <translation variants="no">Scan for networks</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_acl">
+    <comment></comment>        
+    <source>ACL</source>
+    <translation variants="no">ACL</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_inner_eap_type">
+    <comment></comment>        
+    <source>Inner EAP type</source>
+    <translation variants="no">Inner EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_47</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_certificate">
+    <comment></comment>        
+    <source>User certificate</source>
+    <translation variants="no">User certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_45</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_new_pac_store_password">
+    <comment></comment>        
+    <source>New PAC store password:</source>
+    <translation variants="no">New PAC store password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_07</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_57</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_configuring_connection_settings">
+    <comment></comment>        
+    <source>Configuring connection settings</source>
+    <translation variants="no">Configuring connection settings</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_03</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_intranet">
+    <comment></comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_7</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_not_available">
+    <comment>Value for detail in details view.</comment>        
+    <source>Not available</source>
+    <translation variants="no">Not available</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_primary_dns">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Primary DNS</source>
+    <translation variants="no">Primary DNS</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_signal">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Signal</source>
+    <translation variants="no">Signal</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_mode">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Mode</source>
+    <translation variants="no">Mode</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_l1_mw">
+    <comment>Value for detail in details view.</comment>        
+    <source>%L1 mW</source>
+    <translation variants="no">%L1 mW</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_no_vpn_policies_installed">
+    <comment></comment>        
+    <source>No VPN policies installed.</source>
+    <translation variants="no">No VPN policies installed.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_open_network">
+    <comment>Value for detail in details view.</comment>        
+    <source>Open network</source>
+    <translation variants="no">Open network</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key">
+    <comment></comment>        
+    <source>WEP key</source>
+    <translation variants="no">WEP key</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_31</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_closed">
+    <comment>Value for detail in details view.</comment>        
+    <source>Closed</source>
+    <translation variants="no">Closed</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhedss3dessha">
+    <comment></comment>        
+    <source>DHE-DSS,3DES,SHA</source>
+    <translation variants="no">DHE-DSS,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_sent">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Sent</source>
+    <translation variants="no">Sent</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_cancel">
+    <comment>Cancel toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Cancel</source>
+    <translation variants="no">Cancel</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_name">
+    <comment>Custom layout ID parent. Heading for detail in details view.</comment>        
+    <source>Name</source>
+    <translation variants="no">Name</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_known">
+    <comment></comment>        
+    <source>Known</source>
+    <translation variants="no">Known</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_client_cert_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_37_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_adhoc_channel_val_automatic">
+    <comment>Setting value. WLAN ad-hoc networ channel is determined automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_25_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_settings_received_for_multiple_wlan_n">
+    <comment></comment>        
+    <source>Settings received for multiple WLAN networks. Select the network to connect to:</source>
+    <translation variants="no">Settings received for multiple WLAN networks. Select the network to connect to:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_05</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_select_automatically">
+    <comment></comment>        
+    <source>Select automatically</source>
+    <translation variants="no">Select automatically</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wireless_lan">
+    <comment></comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving_val_disabled">
+    <comment></comment>        
+    <source>Disabled</source>
+    <translation variants="no">Disabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_connected_inactive">
+    <comment>Value for detail in details view.</comment>        
+    <source>Connected (inactive)</source>
+    <translation variants="no">Connected (inactive)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_new_wlan_networks_found">
+    <comment></comment>        
+    <source>New WLAN networks found:</source>
+    <translation variants="no">New WLAN networks found:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_connection_failed">
+    <comment></comment>        
+    <source>Connection failed</source>
+    <translation variants="no">Connection failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_intranet">
+    <comment>List item, 2-row, primary text. Name of the Intranet destination.</comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_4</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_searching">
+    <comment></comment>        
+    <source>Searching</source>
+    <translation variants="no">Searching</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_6</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_password_val_prompt">
+    <comment></comment>        
+    <source>Prompt</source>
+    <translation variants="no">Prompt</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_43_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_destination_val_uncategorized">
+    <comment>TODO: to be removed</comment>        
+    <source>Uncategorized</source>
+    <translation variants="no">Uncategorized</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_port_number_val_not_define">
+    <comment>Setting value. Proxy server port number not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_20_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_priority_l1">
+    <comment>List item, 2-row, secondary text. Priority of an access point. %L1 is the priority number (1-n).</comment>        
+    <source>Priority: %L1</source>
+    <translation variants="no">Priority: %L1</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode">
+    <comment>Setting label. WLAN network mode.</comment>        
+    <source>WLAN network mode</source>
+    <translation variants="no">WLAN network mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_automatic">
+    <comment>Setting value. IP address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_17_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_preshared_key_val_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_33_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_4">
+    <comment></comment>        
+    <source>WEP key #4</source>
+    <translation variants="no">WEP key #4</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_switch_wlan_off">
+    <comment></comment>        
+    <source>Switch WLAN off</source>
+    <translation variants="no">Switch WLAN off</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_certificate_mismatch">
+    <comment></comment>        
+    <source>Certificate mismatch</source>
+    <translation variants="no">Certificate mismatch</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wpa2_only">
+    <comment>Setting value. WLAN uses WPA2-only security.</comment>        
+    <source>WPA2 only</source>
+    <translation variants="no">WPA2 only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_user_defined">
+    <comment>Setting value. DNS addresses are user-defined.</comment>        
+    <source>User defined</source>
+    <translation variants="no">User defined</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_password">
+    <comment></comment>        
+    <source>Password:</source>
+    <translation variants="no">Password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_56</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_arrange">
+    <comment>Toolbar button. Sets the view to Arrange mode where drag-and-drop can be used to re-prioritise access points.</comment>        
+    <source>Arrange</source>
+    <translation variants="no">Arrange</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_for_1">
+    <comment></comment>        
+    <source>User name for &apos;%1&apos;:</source>
+    <translation variants="no">User name for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_55</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_uncategorized">
+    <comment>List item, 2-row, primary text. Name of the group of uncategorized access points not belonging to any destination.</comment>        
+    <source>Uncategorized</source>
+    <translation variants="no">Uncategorized</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_8021x">
+    <comment>Value for detail in details view.</comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_server_address_val_not_def">
+    <comment>Setting value. Proxy server address not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_19_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_3">
+    <comment></comment>        
+    <source>#3</source>
+    <translation variants="no">#3</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_status">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Status</source>
+    <translation variants="no">Status</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_enter_key_for_1">
+    <comment>Title for WLAN key query in wizard</comment>        
+    <source>Enter key for &apos;%1&apos;:</source>
+    <translation variants="no">Enter key for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_4</extra-loc-viewid>
+    <extra-loc-positionid>dialog_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_inner_eap">
+    <comment></comment>        
+    <source>Inner EAP</source>
+    <translation variants="no">Inner EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_17</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_share_to_other_destination">
+    <comment>Item specific menu item. Shares the selected access point to another destination, i.e. creates a virtual copy.</comment>        
+    <source>Share to other destination</source>
+    <translation variants="no">Share to other destination</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_enter_l1_on_wireless_station_then">
+    <comment></comment>        
+    <source>Enter &apos;%L1&apos; on wireless station then select &apos;Continue&apos;.</source>
+    <translation variants="no">Enter &apos;%L1&apos; on wireless station then select &apos;Continue&apos;.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_02</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode">
+    <comment></comment>        
+    <source>Provisioning mode</source>
+    <translation variants="no">Provisioning mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wpawpa2_with_eap">
+    <comment></comment>        
+    <source>WPA with EAP</source>
+    <translation variants="no">WPA with EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_infrastructure">
+    <comment>Value for detail in details view.</comment>        
+    <source>Infrastructure</source>
+    <translation variants="no">Infrastructure</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_intranet">
+    <comment>Simple label (groupbox). Name of the Intranet destination.</comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wapi">
+    <comment>Setting value. WLAN uses WAPI security.</comment>        
+    <source>WAPI</source>
+    <translation variants="no">WAPI</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption">
+    <comment></comment>        
+    <source>WEP encryption</source>
+    <translation variants="no">WEP encryption</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_web_feeds">
+    <comment></comment>        
+    <source>Web feeds</source>
+    <translation variants="no">Web feeds</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_ignore">
+    <comment></comment>        
+    <source>Ignore</source>
+    <translation variants="no">Ignore</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="yes" id="txt_occ_dblist_internet_val_ln_access_points">
+    <comment>List item, 2-row, secondary text. Number of access points (%Ln) defined in the destination in question.</comment>        
+    <source>%Ln access points</source>
+    <translation>
+        <numerusform variants="no">(s)%Ln access points</numerusform>
+        <numerusform variants="no">(p)%Ln access points</numerusform>
+    </translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2_3_4_16_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_hexadecimal">
+    <comment></comment>        
+    <source>Hexadecimal</source>
+    <translation variants="no">Hexadecimal</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_authentication_unsuccessful">
+    <comment></comment>        
+    <source>Authentication unsuccessful</source>
+    <translation variants="no">Authentication unsuccessful</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_no_settings_received">
+    <comment></comment>        
+    <source>No settings received</source>
+    <translation variants="no">No settings received</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_name">
+    <comment>Setting label. WLAN network name (SSID). Label has no localisable values.</comment>        
+    <source>WLAN network name</source>
+    <translation variants="no">WLAN network name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_12</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_use_pin_code_instead">
+    <comment></comment>        
+    <source>Use PIN code instead</source>
+    <translation variants="no">Use PIN code instead</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_remove_apn">
+    <comment></comment>        
+    <source>Remove &apos;%1&apos;?</source>
+    <translation variants="no">Remove &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_acl_remove_apn</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password_val_user_defin">
+    <comment></comment>        
+    <source>User defined</source>
+    <translation variants="no">User defined</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_characters_in_wep_key">
+    <comment></comment>        
+    <source>Invalid characters in WEP key</source>
+    <translation variants="no">Invalid characters in WEP key</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_open">
+    <comment></comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_tap_on_a_policy_to_set_a_default">
+    <comment></comment>        
+    <source>Tap on a policy to set a default.</source>
+    <translation variants="no">Tap on a policy to set a default.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2">
+    <comment></comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_internet">
+    <comment>Simple label (groupbox). Name of the Internet destination.</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_connecting_to_1">
+    <comment>Status of WLAN in WLAN list view. WLAN is on, and connection establishment is in progress to access point name &apos;%1&apos;.</comment>        
+    <source>Connecting to &apos;%1&apos;</source>
+    <translation variants="no">Connecting to &apos;%1&apos;</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data_val_l1_connections">
+    <comment></comment>        
+    <source>%L1 connections</source>
+    <translation variants="no">%L1 connections</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_move_to_other_destination">
+    <comment>Item specific menu item. Moves the selected access point to another destination.</comment>        
+    <source>Move to other destination</source>
+    <translation variants="no">Move to other destination</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_used_by">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Used by</source>
+    <translation variants="no">Used by</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_val_generate_automatica">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_40_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_access_point">
+    <comment></comment>        
+    <source>Select access point:</source>
+    <translation variants="no">Select access point:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_2</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapmschapv2_settings">
+    <comment></comment>        
+    <source>EAP-MSCHAPv2 settings</source>
+    <translation variants="no">EAP-MSCHAPv2 settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_secondary_name_server_val_automat">
+    <comment>Setting value. Secondary DNS address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_24_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_val_roam_to_bes">
+    <comment>Setting value. Device roams to best signal strength WLAN access point.</comment>        
+    <source>Roam to best</source>
+    <translation variants="no">Roam to best</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_val_authentic">
+    <comment></comment>        
+    <source>Authenticated</source>
+    <translation variants="no">Authenticated</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_settings_received_for_1_networ">
+    <comment></comment>        
+    <source>Settings received for &apos;%1&apos; network</source>
+    <translation variants="no">Settings received for &apos;%1&apos; network</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate_val_select">
+    <comment></comment>        
+    <source>Select automatically</source>
+    <translation variants="no">Select automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_check_security_key">
+    <comment></comment>        
+    <source>Check security key</source>
+    <translation variants="no">Check security key</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_disconnect_from">
+    <comment></comment>        
+    <source>Maximum number of connections in use. Close an active connection first.</source>
+    <translation variants="no">Maximum number of connections in use. Close an active connection first.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_not_connected">
+    <comment>Status of WLAN in WLAN list view. WLAN is on, but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wep">
+    <comment>Setting value. WLAN uses WEP security.</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_vpn">
+    <comment></comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_preshared_key_too_short_at_least_8">
+    <comment></comment>        
+    <source>Pre-shared key too short. At least 8 characters must be entered.</source>
+    <translation variants="no">Pre-shared key too short. At least 8 characters must be entered.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_internal_error">
+    <comment></comment>        
+    <source>Internal error </source>
+    <translation variants="no">Internal error </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_val_unauthent">
+    <comment></comment>        
+    <source>Unauthenticated</source>
+    <translation variants="no">Unauthenticated</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_1">
+    <comment></comment>        
+    <source>WEP key #1</source>
+    <translation variants="no">WEP key #1</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wep">
+    <comment>Value for detail in details view.</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_add_new_wlan">
+    <comment></comment>        
+    <source>Add new WLAN</source>
+    <translation variants="no">Add new WLAN</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_expires">
+    <comment></comment>        
+    <source>Expires: %1</source>
+    <translation variants="no">Expires: %1</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_continue">
+    <comment></comment>        
+    <source>Continue</source>
+    <translation variants="no">Continue</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_enable_network">
+    <comment></comment>        
+    <source>Enable network</source>
+    <translation variants="no">Enable network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wireless_lan">
+    <comment>Value for detail in details view.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_finish">
+    <comment>finish toolbutton for WLAN wizard summary page</comment>        
+    <source>Finish</source>
+    <translation variants="no">Finish</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_connected_active">
+    <comment>Custom layout ID parent. Value for detail in details view.</comment>        
+    <source>Connected (active)</source>
+    <translation variants="no">Connected (active)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+</context>
+</TS>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/rom/cpwepui.iby	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef CPWEPUI_IBY
+#define CPWEPUI_IBY
+
+#include <data_caging_paths_for_iby.hrh>
+#include <bldvariant.hrh>
+
+file=ABI_DIR/BUILD_DIR/cpwepui.dll  SHARED_LIB_DIR/cpwepui.dll 
+data=/epoc32/data/c/resource/qt/plugins/controlpanel/wlansecurity/cpwepui.qtplugin   resource/qt/plugins/controlpanel/wlansecurity/cpwepui.qtplugin 
+
+
+#endif // CPWEPUI_IBY
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/src/cpwepui.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,667 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Control Panel QT UI for WEP configuration
+ *
+ */
+
+/*
+ * %version: 16 %
+ */
+
+//User Includes
+#include "cpwepui.h"
+
+// System includes
+#include <QStringList>
+#include <cpsettingformentryitemdata.h>
+#include <cpitemdatahelper.h>
+#include <HbDataForm> 
+#include <HbDeviceNotificationDialog> 
+#include <QLocale>
+#include <QCoreApplication>
+#include <cmconnectionmethod_shim.h>
+#include <cmpluginwlandef.h>
+#include <cmmanagerdefines_shim.h>
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpwepuiTraces.h"
+#endif
+
+// Constants
+//The order in which WEP only mode appears in the list of available 
+//security mode
+static const int UI_ORDER_WEP = 10;
+
+/*!
+ \class CpWepUi
+ \brief CpWepUi implements the WEP Security Settings Control Panel Plugin
+ which will allow viewing/editing of WEP Security Settings.
+ */
+//Contructs WEP object
+CpWepUi::CpWepUi() :
+    mUi(NULL), mNewKeySelected(0), mTranslator(NULL), mCmCM(NULL), mCmId(0)
+{
+    mTranslator = new QTranslator(this);
+    mTranslator->load(":/loc/wlan_en_GB.qm");
+    qApp->installTranslator(mTranslator);
+
+    /* Install localization
+     mTranslator = QSharedPointer<HbTranslator> (
+     new HbTranslator("wlan_en_GB"));*/
+}
+
+//Deletes all objects WEP owns
+CpWepUi::~CpWepUi()
+{
+    OstTraceFunctionEntry1(CPWEPUI_CPWEPUI_ENTRY,this);
+    //Elements like mUi and components that belong to it
+    //, are taken care by the parent
+    OstTraceFunctionExit1(CPWEPUI_CPWEPUI_EXIT,this);
+}
+
+// ======== MEMBER FUNCTIONS ========
+
+
+/*!
+ Getter for security mode.
+
+ \return Security mode identifier
+ */
+CMManagerShim::WlanSecMode CpWepUi::securityMode() const
+{
+    OstTraceFunctionEntry1(CPWEPUI_MODE_ENTRY,this);
+    OstTraceFunctionExit1(CPWEPUI_MODE_EXIT,this);
+    //return security mode
+    return CMManagerShim::WlanSecModeWep;
+}
+
+/*!
+ Getter for localization text identifier for the security mode,
+ f.ex. "txt_occ_setlabel_wlan_security_mode_val_wep". This localized
+ text will be shown in the UI.
+ 
+ \return Localization text ID
+ */
+QString CpWepUi::securityModeTextId() const
+{
+    OstTraceFunctionEntry1(CPWEPUI_LOCALIZATION_ID_ENTRY,this);
+    OstTraceFunctionExit1(CPWEPUI_LOCALIZATION_ID_EXIT,this);
+    return "txt_occ_setlabel_wlan_security_mode_val_wep";
+}
+
+/*! 
+ Sets the database reference (WLAN Service Table ID).
+
+ \param id Database reference
+ */
+void CpWepUi::setReference(CmConnectionMethodShim *cmCm, uint id)
+{
+    OstTraceFunctionEntry1(CPWEPUI_SETREFERENCE_ENTRY,this);
+
+    // Assuming that id is the connection method Id/IAP Id.
+    //mCmId - Not used currently
+    mCmId = id;
+
+    //mCmCM is not deleted assuming CmManager owns it.
+    mCmCM = cmCm;
+    OstTraceFunctionExit1(CPWEPUI_SETREFERENCE_EXIT,this);
+}
+
+/*!
+ Getter for order number. This order number is used by the client of
+ this interface to put the security modes in correct order in the list.
+
+ \return An order number
+ */
+int CpWepUi::orderNumber() const
+{
+    OstTraceFunctionEntry1(CPWEPUI_ORDERNUMBER_ENTRY,this);
+    OstTraceFunctionExit1(CPWEPUI_ORDERNUMBER_EXIT,this);
+    return UI_ORDER_WEP;
+}
+
+/*!
+ * Returns the fully constructed Ui Group , for WEP security plugin
+ * 
+ * \param \param dataHelper to add Connections
+ * 
+ * \return The WEP UI
+ */
+CpSettingFormItemData* CpWepUi::uiInstance(CpItemDataHelper &dataHelpper)
+{
+    int err;
+    OstTraceFunctionEntry1(CPWEPUI_UIINSTANCE_ENTRY,this);
+
+    //Read values From CommsDatbase
+    QT_TRYCATCH_ERROR(err, loadFieldsFromDataBase());
+    if (err != KErrNone) {
+        OstTrace1( TRACE_ERROR, CPWEPUI_UIINSTANCE, "LoadFromDataBase returned %d", err );
+    }
+
+    mUi = new CpSettingFormItemData(HbDataFormModelItem::GroupItem, hbTrId(
+            "txt_occ_subhead_security_settings"));
+
+    CpSettingFormItemData *wepKeyInUse = new CpSettingFormItemData(
+            HbDataFormModelItem::ComboBoxItem, hbTrId(
+                    "txt_occ_setlabel_wep_key_in_use"), mUi);
+    QStringList wepKeys;
+    wepKeys.append(hbTrId("txt_occ_setlabel_wep_key_in_val_1"));
+    wepKeys.append(hbTrId("txt_occ_setlabel_wep_key_in_val_2"));
+    wepKeys.append(hbTrId("txt_occ_setlabel_wep_key_in_val_3"));
+    wepKeys.append(hbTrId("txt_occ_setlabel_wep_key_in_val_4"));
+
+    wepKeyInUse->setContentWidgetData("items", wepKeys);
+    wepKeyInUse->setContentWidgetData("currentIndex", mNewKeySelected);
+    dataHelpper.addConnection(wepKeyInUse, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(wepKeyInUseChanged(int)));
+    mUi->appendChild(wepKeyInUse);
+
+    createWEPKeyOneGroup(dataHelpper);
+
+    createWEPKeyTwoGroup(dataHelpper);
+
+    createWEPKeyThreeGroup(dataHelpper);
+
+    createWEPKeyFourGroup(dataHelpper);
+
+    OstTraceFunctionExit1(CPWEPUI_UIINSTANCE_EXIT,this);
+    return mUi;
+}
+
+/*!
+ * Create Ui element with text edit for WEP KEY One
+ * 
+ * \param dataHelper to add Connections
+ */
+void CpWepUi::createWEPKeyOneGroup(CpItemDataHelper &dataHelpper)
+    {
+    OstTraceFunctionEntry1(CPWEPUI_CREATEWEPKEYONEGROUP_ENTRY,this);
+    mWepKeyText[KFirstKey] = new CpSettingFormItemData(
+            HbDataFormModelItem::TextItem,
+            hbTrId("txt_occ_subhead_wep_key_1"), mUi);
+
+    if (mKeyData[KFirstKey].length() != 0) {
+        mWepKeyText[KFirstKey]->setContentWidgetData("text",
+                mKeyData[KFirstKey]);
+    }
+    mWepKeyText[KFirstKey]->setContentWidgetData("echoMode", 2);
+    mWepKeyText[KFirstKey]->setContentWidgetData("smileysEnabled", "false");
+
+    dataHelpper.addConnection(mWepKeyText[KFirstKey],
+            SIGNAL( editingFinished ()), this, SLOT(wepKeyOneChanged() ));
+
+    mUi->appendChild(mWepKeyText[KFirstKey]);
+    OstTraceFunctionExit1(CPWEPUI_CREATEWEPKEYONEGROUP_EXIT,this);
+    }
+
+/*!
+ * Create Ui element with text edit for WEP KEY Two
+ * \param dataHelper to add Connections
+ */
+void CpWepUi::createWEPKeyTwoGroup(CpItemDataHelper &dataHelpper)
+{
+    OstTraceFunctionEntry1(CPWEPUI_CREATEWEPKEYTWOGROUP_ENTRY,this);
+    mWepKeyText[KSecondKey] = new CpSettingFormItemData(
+            HbDataFormModelItem::TextItem,
+            hbTrId("txt_occ_subhead_wep_key_2"), mUi);
+
+    if (mKeyData[KSecondKey].length() != 0) {
+        mWepKeyText[KSecondKey]->setContentWidgetData("text",
+                mKeyData[KSecondKey]);
+    }
+    mWepKeyText[KSecondKey]->setContentWidgetData("echoMode", 2);
+    mWepKeyText[KSecondKey]->setContentWidgetData("smileysEnabled", "false");
+    dataHelpper.addConnection(mWepKeyText[KSecondKey],
+            SIGNAL( editingFinished ()), this, SLOT(wepKeyTwoChanged() ));
+
+    mUi->appendChild(mWepKeyText[KSecondKey]);
+    OstTraceFunctionExit1(CPWEPUI_CREATEWEPKEYTWOGROUP_EXIT,this);
+}
+
+/*!
+ * Create Ui element with text edit for WEP KEY Three
+ * \param dataHelper to add Connections
+ */
+void CpWepUi::createWEPKeyThreeGroup(CpItemDataHelper &dataHelpper)
+{
+    OstTraceFunctionEntry1(CPWEPUI_CREATEWEPKEYTHREEGROUP_ENTRY,this);
+    mWepKeyText[KThirdKey] = new CpSettingFormItemData(
+            HbDataFormModelItem::TextItem,
+            hbTrId("txt_occ_subhead_wep_key_3"), mUi);
+
+    if (mKeyData[KThirdKey].length() != 0) {
+        mWepKeyText[KThirdKey]->setContentWidgetData("text",
+                mKeyData[KThirdKey]);
+    }
+    mWepKeyText[KThirdKey]->setContentWidgetData("echoMode", 2);
+    mWepKeyText[KThirdKey]->setContentWidgetData("smileysEnabled", "false");
+    dataHelpper.addConnection(mWepKeyText[KThirdKey],
+            SIGNAL( editingFinished ()), this, SLOT(wepKeyThreeChanged() ));
+
+    mUi->appendChild(mWepKeyText[KThirdKey]);
+    OstTraceFunctionExit1(CPWEPUI_CREATEWEPKEYTHREEGROUP_EXIT,this);
+}
+
+/*!
+ * Create Ui element with text edit for WEP KEY  Four
+ * \param dataHelper to add Connections
+ */
+void CpWepUi::createWEPKeyFourGroup(CpItemDataHelper &dataHelpper)
+{
+    OstTraceFunctionEntry1(CPWEPUI_CREATEWEPKEYFOURGROUP_ENTRY,this);
+    mWepKeyText[KFourthKey] = new CpSettingFormItemData(
+            HbDataFormModelItem::TextItem,
+            hbTrId("txt_occ_subhead_wep_key_4"), mUi);
+
+    if (mKeyData[KFourthKey].length() != 0) {
+        mWepKeyText[KFourthKey]->setContentWidgetData("text",
+                mKeyData[KFourthKey]);
+    }
+    mWepKeyText[KFourthKey]->setContentWidgetData("echoMode", 2);
+    mWepKeyText[KFourthKey]->setContentWidgetData("smileysEnabled", "false");
+    dataHelpper.addConnection(mWepKeyText[KFourthKey],
+            SIGNAL( editingFinished ()), this, SLOT(wepKeyFourChanged() ));
+
+    mUi->appendChild(mWepKeyText[KFourthKey]);
+    OstTraceFunctionExit1(CPWEPUI_CREATEWEPKEYFOURGROUP_EXIT,this);
+}
+
+/*!
+ * Slot to handle , if a different wep key (index) 
+ * is made active
+ * \param wepKeyInUse index of the chosen wep key
+ */
+void CpWepUi::wepKeyInUseChanged(int wepKeyInUse)
+{
+    OstTraceFunctionEntry1(CPWEPUI_WEPKEYINUSECHANGED_ENTRY,this);
+
+    int err;
+    //Update CommsDat
+    QT_TRYCATCH_ERROR(err, mCmCM->setIntAttribute(CMManagerShim::WlanWepKeyIndex, wepKeyInUse));
+    if (err != KErrNone) {
+        OstTrace1( TRACE_ERROR, CPWEPUI_WEPKEYINUSECHANGED, "Error wepKeyInUse returned %d", err );
+    }
+    tryUpdate();
+    OstTraceFunctionExit1(CPWEPUI_WEPKEYINUSECHANGED_EXIT,this);
+}
+
+/*!
+ * Slot to handle ,when the  
+ *   wep key one string gets changed
+ * 
+ * 
+ */
+void CpWepUi::wepKeyOneChanged()
+{
+    int err;
+    OstTraceFunctionEntry1(CPWEPUI_WEPKEY1STRINGCHANGED_ENTRY,this);
+    QT_TRYCATCH_ERROR(err, wepKeyTextChanged(KFirstKey));
+    if (err != KErrNone) {
+        OstTrace1( TRACE_ERROR,CPWEPUI_WEPKEYONECHANGED, "Error wepKeyOneChanged returned %d", err );
+        }
+    OstTraceFunctionExit1(CPWEPUI_WEPKEY1STRINGCHANGED_EXIT,this);
+}
+
+/*!
+ * Slot to handle ,when the  
+ *   wep key two string gets changed
+ * 
+ * 
+ */
+void CpWepUi::wepKeyTwoChanged()
+{
+    int err;
+    OstTraceFunctionEntry1(CPWEPUI_WEPKEY2STRINGCHANGED_ENTRY,this);
+    QT_TRYCATCH_ERROR(err, wepKeyTextChanged(KSecondKey));
+    if (err != KErrNone) {
+        OstTrace1( TRACE_ERROR, CPWEPUI_WEPKEYTWOCHANGED, "Error wepKeyTwoChanged returned %d", err );
+    }
+    OstTraceFunctionExit1(CPWEPUI_WEPKEY2STRINGCHANGED_EXIT,this);
+}
+
+/*!
+ * Slot to handle ,when the  
+ *   wep key three string gets changed
+ * 
+ * 
+ */
+void CpWepUi::wepKeyThreeChanged()
+{
+    int err;
+    OstTraceFunctionEntry1(CPWEPUI_WEPKEY3STRINGCHANGED_ENTRY,this);
+    QT_TRYCATCH_ERROR(err, wepKeyTextChanged(KThirdKey));
+    if (err != KErrNone) {
+        OstTrace1( TRACE_ERROR,CPWEPUI_WEPKEYTHREECHANGED, "Error wepKeyThreeChanged returned %d", err );
+    }
+    OstTraceFunctionExit1(CPWEPUI_WEPKEY3STRINGCHANGED_EXIT,this);
+}
+
+/*!
+ * Slot to handle ,when the  
+ *   wep key four string gets changed
+ * 
+ * 
+ */
+void CpWepUi::wepKeyFourChanged()
+{
+    int err;
+    OstTraceFunctionEntry1(CPWEPUI_WEPKEY4STRINGCHANGED_ENTRY,this);
+    QT_TRYCATCH_ERROR(err, wepKeyTextChanged(KFourthKey));
+    if (err != KErrNone) {
+        OstTrace1( TRACE_ERROR, CPWEPUI_WEPKEYFOURCHANGED, "Error wepKeyFourChanged returned %d", err );
+    }OstTraceFunctionExit1(CPWEPUI_WEPKEY4STRINGCHANGED_EXIT,this);
+}
+
+/*!
+ * Slot to handle change in either of the 4 WEP key strings
+ * 
+ * \param index of the WEP key that changed
+ */
+void CpWepUi::wepKeyTextChanged(int index)
+{
+    OstTraceFunctionEntry1(CPWEPUI_WEPKEYTEXTCHANGED_ENTRY,this);
+
+    QVariant value = mWepKeyText[index]->contentWidgetData("text");
+
+    WepKeyValidator::KeyStatus keystatus = WepKeyValidator::validateWepKey(
+            value.toString());
+
+    if (keystatus == WepKeyValidator::KeyStatusOk) {
+        QString key = value.toString();
+
+        //If key is valid set the format of the key
+        setKeyFormat(key, index);
+
+        //Get the right field to store
+        CMManagerShim::ConnectionMethodAttribute keyEnum = getWEPKeyEnum(index);
+
+        //Store the WEP key
+        storeWEPKey(keyEnum, key);
+
+        //Update the latest key into array
+        mKeyData[index] = key;
+
+        /*
+         * Commit All 4 WEP keys , anyways
+         */
+        commitWEPkeys(index);
+    }
+    else {
+        showMessageBox(HbMessageBox::MessageTypeWarning, hbTrId(
+                "txt_occ_info_invalid_input"));
+    }
+    OstTraceFunctionExit1(CPWEPUI_WEPKEYTEXTCHANGED_EXIT,this);
+}
+
+/*!
+ * Store the WEP key in Comms
+ * \enumValue the right field represented by the enum value
+ * \key the WEP key String to store
+ */
+void CpWepUi::storeWEPKey(CMManagerShim::ConnectionMethodAttribute enumValue,
+        QString& key)
+{
+    mCmCM->setString8Attribute(enumValue, key);
+    tryUpdate();
+}
+
+/*!
+ * Set the WEP key format
+ * \key string to identify format
+ * \index of the WEP key
+ */
+void CpWepUi::setKeyFormat(QString& key, int index)
+{
+    if (key.length() == WepKeyValidator::WepHex64BitMaxLength || key.length()
+            == WepKeyValidator::WepHex128BitMaxLength) {
+        mkeyFormat[index] = EFormatHex;
+    }
+
+    else if (key.length() == WepKeyValidator::WepAscii64BitMaxLength
+            || key.length() == WepKeyValidator::WepAscii128BitMaxLength) {
+        mkeyFormat[index] = EFormatAscii;
+    }
+}
+
+/*!Get the right field in DB
+ * \index of the WEP key
+ */
+CMManagerShim::ConnectionMethodAttribute CpWepUi::getWEPKeyEnum(int index)
+{
+    CMManagerShim::ConnectionMethodAttribute keyenum(
+            CMManagerShim::WlanWepKey1InHex);
+    switch (index)
+        {
+        case KFirstKey:
+            {
+                if (mkeyFormat[index] == EFormatHex) {
+                    keyenum = CMManagerShim::WlanWepKey1InHex;
+                }
+                else {
+                    keyenum = CMManagerShim::WlanWepKey1InAscii;
+                }
+            }
+            break;
+
+        case KSecondKey:
+            {
+                if (mkeyFormat[index] == EFormatHex) {
+                    keyenum = CMManagerShim::WlanWepKey2InHex;
+                }
+                else {
+                    keyenum = CMManagerShim::WlanWepKey2InAscii;
+                }
+            }
+            break;
+
+        case KThirdKey:
+            {
+                if (mkeyFormat[index] == EFormatHex) {
+                    keyenum = CMManagerShim::WlanWepKey3InHex;
+                }
+                else {
+                    keyenum = CMManagerShim::WlanWepKey3InAscii;
+                }
+            }
+            break;
+
+        case KFourthKey:
+            {
+                if (mkeyFormat[index] == EFormatHex) {
+                    keyenum = CMManagerShim::WlanWepKey4InHex;
+                }
+                else {
+                    keyenum = CMManagerShim::WlanWepKey4InAscii;
+                }
+            }
+            break;
+
+        default:
+            break;
+        }
+    return keyenum;
+}
+/*
+ * Read all security settings from the Comms 
+ */
+void CpWepUi::loadFieldsFromDataBase()
+{
+    OstTraceFunctionEntry1(CPWEPUI_LOADFIELDSFROMDATABASE_ENTRY,this);
+
+    //Wep Key in Use 
+    mNewKeySelected = mCmCM->getIntAttribute(CMManagerShim::WlanWepKeyIndex);
+
+    //All data fetched in Hex Format
+    mKeyData.insert(KFirstKey, mCmCM->getString8Attribute(
+            CMManagerShim::WlanWepKey1InHex));
+
+    mKeyData.insert(KSecondKey, mCmCM->getString8Attribute(
+            CMManagerShim::WlanWepKey2InHex));
+
+    mKeyData.insert(KThirdKey, mCmCM->getString8Attribute(
+            CMManagerShim::WlanWepKey3InHex));
+
+    mKeyData.insert(KFourthKey, mCmCM->getString8Attribute(
+            CMManagerShim::WlanWepKey4InHex));
+
+    /*Set all key formats to Hex by default; because all keys are read in Hex from DB*/
+    for (int count = 0; count < KMaxNumberofKeys; count++)
+        {
+        mkeyFormat[count] = EFormatHex;
+        }
+
+    OstTraceFunctionExit1(CPWEPUI_LOADFIELDSFROMDATABASE_EXIT,this);
+}
+
+/*!
+ Tries to update connection method changes to CommsDat.
+ Returns "true" if success, "false" if some error happened. 
+ */
+bool CpWepUi::tryUpdate()
+{
+    OstTraceFunctionEntry1(CPWEPUI_TRYUPDATE_ENTRY,this);
+
+    bool ret(true);
+    // Try update
+    try {
+        mCmCM->update();
+    }
+    catch (const std::exception&) {
+        // Handle error
+        handleUpdateError();
+        ret = false;
+    }
+
+    OstTraceFunctionExit1(DUP1_CPWEPUI_TRYUPDATE_EXIT,this);
+    return ret;
+}
+
+/*!
+ Handles failed CommsDat update.
+ */
+void CpWepUi::handleUpdateError()
+{
+    OstTraceFunctionEntry1(CPWEPUI_HANDLEUPDATEERROR_ENTRY,this);
+
+    // Show error note to user
+    showMessageBox(HbMessageBox::MessageTypeWarning, hbTrId(
+            "txt_occ_info_unable_to_save_setting"));
+    // Reload settings from CommsDat and update UI
+    try {
+        mCmCM->refresh();
+    }
+    catch (const std::exception&) {
+        // Ignore error from refresh. Most likely this will not happen, but
+        // if it does, there isn't very much we can do.
+        OstTrace0(
+                TRACE_ERROR,
+                CPWEPPLUGIN_HANDLEUPDATEERROR,
+                "Refresh failed");
+    };
+    updateWepSettings();
+
+    OstTraceFunctionExit1(CPWEPUI_HANDLEUPDATEERROR_EXIT,this);
+}
+
+/*!
+ Shows message box with "OK" button using given text.
+ */
+void CpWepUi::showMessageBox(HbMessageBox::MessageBoxType type,
+        const QString &text)
+{
+    OstTraceFunctionEntry1(CPWEPUI_SHOWMESSAGEBOX_ENTRY,this);
+
+    // Create a message box
+    mMessageBox = QSharedPointer<HbMessageBox> (new HbMessageBox(type));
+    mMessageBox->setText(text);
+    mMessageBox->open();
+
+    OstTraceFunctionExit1(CPWEPUI_SHOWMESSAGEBOX_EXIT,this);
+}
+
+/*!
+ * Reset the Key Items on the Ui, by reading the previously set value from Comms
+ */
+void CpWepUi::updateWepSettings()
+    {
+    OstTraceFunctionEntry1(CPWEPUI_UPDATEWEPSETTINGS_ENTRY,this);
+    //Read values from Comms and update the Ui items; 
+    loadFieldsFromDataBase();
+
+    mWepKeyText[KFirstKey]->setContentWidgetData("text", mKeyData[KFirstKey]);
+
+    mWepKeyText[KSecondKey]->setContentWidgetData("text",
+            mKeyData[KSecondKey]);
+
+    mWepKeyText[KThirdKey]->setContentWidgetData("text", mKeyData[KThirdKey]);
+
+    mWepKeyText[KFourthKey]->setContentWidgetData("text",
+            mKeyData[KFourthKey]);
+
+    OstTraceFunctionExit1(CPWEPUI_UPDATEWEPSETTINGS_EXIT,this);
+    }
+
+/*!
+ * Commit all WEP keys , except the one which was just set
+ * 
+ * \param index ; the index of the key that was just set
+ */
+void CpWepUi::commitWEPkeys(int index)
+    {
+    OstTraceFunctionEntry1(CPWEPUI_COMMITWEPKEYS_ENTRY,this);
+    //We have all data in Hex, so setting all WEP keys in hex
+
+    if (index != KFirstKey) {
+        //Get the right field to store
+        CMManagerShim::ConnectionMethodAttribute keyEnumOne = getWEPKeyEnum(
+                KFirstKey);
+
+        //Store the WEP key
+        storeWEPKey(keyEnumOne, mKeyData[KFirstKey]);
+    }
+
+    if (index != KSecondKey) {
+        //Get the right field to store
+        CMManagerShim::ConnectionMethodAttribute keyEnumTwo = getWEPKeyEnum(
+                KSecondKey);
+
+        //Store the WEP key
+        storeWEPKey(keyEnumTwo, mKeyData[KSecondKey]);
+    }
+
+    if (index != KThirdKey) {
+        //Get the right field to store
+        CMManagerShim::ConnectionMethodAttribute keyEnumThree =
+                getWEPKeyEnum(KThirdKey);
+
+        //Store the WEP key
+        storeWEPKey(keyEnumThree, mKeyData[KThirdKey]);
+    }
+
+    if (index != KFourthKey) {
+        //Get the right field to store
+        CMManagerShim::ConnectionMethodAttribute keyEnumFour = getWEPKeyEnum(
+                KFourthKey);
+
+        //Store the WEP key
+        storeWEPKey(keyEnumFour, mKeyData[KFourthKey]);
+    }
+
+    OstTraceFunctionExit1(CPWEPUI_COMMITWEPKEYS_EXIT,this);
+}
+
+Q_EXPORT_PLUGIN2(CpWepUi, CpWepUi)
+;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/src/wepkeyvalidator.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Validation methods for WEP keys
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#include <QString>
+#include <QDebug>
+#include "wepkeyvalidator.h"
+
+/*!
+    \class WepKeyValidator wepkeyvalidator.cpp
+    \brief Utilities for WEP key validations.
+    
+*/
+/*!
+    \enum WepKeyValidator::KeyStatus
+    This enum defines the validation results.
+
+    \var WepKeyValidator::KeyStatusOk
+    Key is valid.
+    
+    \var WepKeyValidator::KeyStatusIllegalCharacters
+    Key contains illegal characters.
+
+    \var WepKeyValidator::KeyStatusWepInvalidLength
+    WEP key length is not valid. Valid keys are 
+    - hex: 10 or 26 characters
+    - ascii: 5 or 13 characters. See WlanWizardUtils::validateWpaKey().
+*/
+
+
+/*!
+ * Process WEP key validation. Following keys are allowed:
+ * 
+ * HEX: 
+ * - 64 bit: allowed key length = 10
+ * - 128 bit: allowed key length = 26
+ * 
+ * ASCII:
+ * - 64 bit: allowed key length = 5   
+ * - 128 bit: allowed key length = 13
+ * 
+ * @param key WEP Key to be validated
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ * - KeyStatusWepInvalidLength
+ */
+WepKeyValidator::KeyStatus WepKeyValidator::validateWepKey(const QString &key)
+{
+    int length = key.length();
+    KeyStatus ret = KeyStatusOk;
+    // HEX
+    if (length == WepHex64BitMaxLength || length == WepHex128BitMaxLength) {
+        ret = isHex(key);
+    }
+    // ASCII
+    else if (length == WepAscii64BitMaxLength || length == WepAscii128BitMaxLength) {
+        ret = isAscii(key);
+    }
+    
+    else if (length == WepKeyEmptyString) {
+       ret =  KeyStatusOk ;  
+    }
+    
+    else {
+        ret = KeyStatusWepInvalidLength;
+    }
+
+    return ret;
+}
+
+/*!
+ * Process Ascii validation. Allowed characters are from 32 to 126.
+ * 
+ * @param key to be validated.
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ */
+WepKeyValidator::KeyStatus WepKeyValidator::isAscii(const QString &key)
+{
+    QChar ch32(32);
+    QChar ch126(126);
+ 
+    const QChar *data = key.data();
+    while (!data->isNull()) {
+        if ((*data) < ch32 || (*data) > ch126) {
+            return KeyStatusIllegalCharacters;
+        }
+        ++data;
+    }
+    return KeyStatusOk;
+}
+
+/*!
+ * Process Hex validation. Allowed characters are
+ * - from 0 to 9
+ * - from a to f
+ * - from A to F
+ * 
+ * @param key to be validated.
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ */
+WepKeyValidator::KeyStatus WepKeyValidator::isHex(const QString &key)
+{
+    QChar ch_A(65); // Character: A
+    QChar ch_F(70); // Character: F
+    QChar ch_a(97); // Character: a
+    QChar ch_f(102);// Character: f
+
+   
+    const QChar *data = key.data();
+    while (!data->isNull()) {
+        if (data->isDigit() ||
+            (*data) >= ch_a && (*data) <= ch_f ||
+            (*data) >= ch_A && (*data) <= ch_F) {
+            ++data;
+        }
+        else {
+            return KeyStatusIllegalCharacters;
+        }
+    }
+    return KeyStatusOk;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwepui/traces/OstTraceDefinitions.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: .
+ *   
+ *
+ */
+ 
+/*
+ * %version: 2 %
+ */
+ 
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+#include <opensystemtrace.h>
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwlansecurityuiplugins.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+# Control Panel QT UIs for WLAN security settings configuration
+#
+# %version: tr1cfwln#4.1.1 %
+
+TEMPLATE = subdirs
+
+SUBDIRS  += \
+		cpwepui \
+		cpwpaui \
+		cpwpa2ui \
+		cpwpacmnui
+		
+
+CONFIG += ordered
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/cpwpa2ui.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,69 @@
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+# Contributors:
+# Description:
+# %version: tr1cfwln#5 %
+TEMPLATE = lib
+TARGET = cpwpa2ui
+DEPENDPATH += 
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+    $$OS_LAYER_SYSTEMINCLUDE \
+    ../cpwpacmnui/inc \
+    ../../inc
+    
+CONFIG += hb \
+    plugin
+LIBS += -lcpframework \
+    -leapqtplugininfo \
+    -lcpwpacmnui \
+    -lconnection_settings_shim
+MOC_DIR = _moc
+RCC_DIR = _rcc
+OBJECTS_DIR = _objects
+
+# Input
+HEADERS += inc/wpa2keyvalidator.h \
+    traces/OstTraceDefinitions.h \
+    inc/cpwpa2ui.h
+SOURCES += src/wpa2keyvalidator.cpp \
+    src/cpwpa2ui.cpp
+symbian: { 
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.UID3 = 0x2002DC73
+    LIBS += -leapqtconfiginterface
+    BLD_INF_RULES.prj_exports += "rom/cpwpa2ui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpa2ui.iby)"
+}
+symbian { 
+    deploy.path = C:
+    qtplugins.path = /resource/qt/plugins/controlpanel/wlansecurity
+    qtplugins.sources += qmakepluginstubs/cpwpa2ui.qtplugin
+    
+    # This is for new exporting system coming in garden
+    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+}
+
+# Temporary solution to fix tracecompiler
+# When tracecompiler is fixed, this can be removed
+symbian: {
+    MMP_RULES += "USERINCLUDE traces"
+}
+
+# temporary not used; waiting for the latest .ts file ; accordingly export will change
+# translation file temporarily read as qt resource
+# TRANSLATIONS += /resource/qtwlan_en_GB.ts
+
+RESOURCES += resources/resource.qrc
+
+TARGET.CAPABILITY = CAP_GENERAL_DLL
+dynamiclibrary.sources = cpwpacmnui.dll
+dynamiclibrary.path = /sys/bin
+plugin.sources += cpwpa2ui.dll
+plugin.path = /resource/qt/plugins/controlpanel
+DEPLOYMENT += plugin \
+    dynamiclibrary
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/inc/cpwpa2ui.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,126 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*    Control Panel QT UI for WPA2 only configuration
+*
+*/
+
+/*
+* %version: 10 %
+*/
+
+
+#ifndef CPWPA2UI_H
+#define CPWPA2UI_H
+
+// System includes
+#include <cpsettingformitemdata.h>
+#include <HbMessageBox>
+//#include <HbTranslator>
+//#include <QSharedPointer>
+#include <QTranslator>
+
+
+// User includes
+#include "cpwlansecurityplugininterface.h"
+
+// Forward declarations
+class EapPluginInformation;
+class PluginInformation;
+class CpBaseSettingView;
+class EapQtConfigInterface;
+class EapEntyItemData;
+class CpWpaCmnUi;
+class CmConnectionMethodShim;
+
+/*!
+ * @addtogroup group_wlan_security_ui_plugin_wpa2_only
+ * @{
+ */
+
+/*! 
+ * Implements WPA2 only plugin for Wlan security control panel  
+ */
+// Class declaration
+class CpWpa2Ui : public QObject, public CpWlanSecurityPluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(CpWlanSecurityPluginInterface)
+
+public:
+    CpWpa2Ui();
+    ~CpWpa2Ui();
+
+public: // from CpWlanSecurityPluginInterface 
+          
+        CMManagerShim::WlanSecMode securityMode() const;
+        
+        QString securityModeTextId() const;
+       
+       void setReference(CmConnectionMethodShim *cmCm, uint id);
+              
+       int orderNumber() const;
+              
+       CpSettingFormItemData* uiInstance(
+               CpItemDataHelper &dataHelper);
+    
+private:
+       
+       bool tryUpdate();
+
+       void handleUpdateError();
+
+       void showMessageBox( HbMessageBox::MessageBoxType type,
+           const QString &text);
+
+       void updateWpaSettings();
+  
+private slots:
+ 
+    //void currentEapPlugin(int currentPlugin);    
+    //void wpaTypeChanged(int pskEnable);
+    void pskKeyChanged(QString& key);
+    
+
+private:
+    
+    Q_DISABLE_COPY(CpWpa2Ui)
+        
+    //!WPA security group item
+    CpSettingFormItemData* mUi;   
+
+    //! Connection method Id
+    int mCmId;
+   
+    //!Translator for all the localisation Text Id's
+    //QSharedPointer<HbTranslator> mTranslator;
+    QTranslator* mTranslator;
+    
+    //! Connection Settings Shim connection method pointer    
+    CmConnectionMethodShim *mCmCM;    
+    
+    //! Eap Plugin config interface
+	EapQtConfigInterface *mEapQtConfigInterface;
+	
+	//!WPA ui Implementer Interface
+    QScopedPointer <CpWpaCmnUi> mWpa2Ui;
+    
+    //! Message box for info notes
+    QSharedPointer<HbMessageBox> mMessageBox;
+
+ };
+
+/*! @} */
+ 
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/inc/wpa2keyvalidator.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   WLAN Wizard Utilities
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#ifndef WPA2KEYVALIDATOR_H
+#define WPA2KEYVALIDATOR_H
+
+/*!
+ * @addtogroup group_wpa_key_validator
+ * @{
+ */
+
+class Wpa2KeyValidator
+{
+public:
+    enum KeyStatus
+    {
+        KeyStatusOk,
+        KeyStatusIllegalCharacters,
+        KeyStatusWpa2TooShort,
+        KeyStatusWpa2TooLong,
+    };
+
+    static const int Wpa2MaxLenght = 64;
+    static const int Wpa2MinLenght = 8;
+    
+public:
+
+    static KeyStatus validateWpa2Key(const QString &key);
+    static KeyStatus isAscii(const QString &key);
+    static KeyStatus isHex(const QString &key);
+};
+
+/*! @} */
+
+#endif /* WPA2KEYVALIDATOR_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/resources/resource.qrc	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/loc" >
+        <file>wlan_en_GB.qm</file>
+    </qresource>
+</RCC>
Binary file securitysettings/cpwlansecurityuiplugins/cpwpa2ui/resources/wlan_en_GB.qm has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/resources/wlan_en_GB.ts	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,4052 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="3.0" language="en_GB" sourcelanguage="en_GB">
+<context>
+<message numerus="no" id="txt_occ_dblist_destination">
+    <comment>Title for destination summary item</comment>        
+    <source>Destination</source>
+    <translation variants="no">Destination</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_add_apn">
+    <comment></comment>        
+    <source>Add APN</source>
+    <translation variants="no">Add APN</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_phone_ip_address">
+    <comment>Setting label. IP address for the phone.</comment>        
+    <source>Phone IP address</source>
+    <translation variants="no">Phone IP address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_17</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode">
+    <comment>Title for network mode summary item</comment>        
+    <source>Network mode</source>
+    <translation variants="no">Network mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_realm_val_generate_automatically">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_54_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv0">
+    <comment></comment>        
+    <source>PEAPv0</source>
+    <translation variants="no">PEAPv0</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_medium_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Medium (%L1%)</source>
+    <translation variants="no">Medium (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wireless_lan">
+    <comment></comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_titlebar</extra-loc-layout_id>    
+    <extra-loc-viewid>occ</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_forget_network">
+    <comment></comment>        
+    <source>Forget network</source>
+    <translation variants="no">Forget network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_settings_2</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_cipher_suites">
+    <comment></comment>        
+    <source>Cipher suites</source>
+    <translation variants="no">Cipher suites</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsa3dessha">
+    <comment></comment>        
+    <source>RSA,3DES,SHA</source>
+    <translation variants="no">RSA,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhersa3dessha">
+    <comment></comment>        
+    <source>DHE-RSA,3DES,SHA</source>
+    <translation variants="no">DHE-RSA,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_downloads">
+    <comment></comment>        
+    <source>Downloads</source>
+    <translation variants="no">Downloads</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_configuration_failed">
+    <comment></comment>        
+    <source>Configuration failed</source>
+    <translation variants="no">Configuration failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_java_app">
+    <comment></comment>        
+    <source>Java app.</source>
+    <translation variants="no">Java app.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_low_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Low (%L1%)</source>
+    <translation variants="no">Low (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_unencrypted_connection_val_allowe">
+    <comment></comment>        
+    <source>Allowed</source>
+    <translation variants="no">Allowed</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_62_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_128bit_key">
+    <comment></comment>        
+    <source>128-bit key</source>
+    <translation variants="no">128-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_wlan_only">
+    <comment></comment>        
+    <source>WLAN only</source>
+    <translation variants="no">WLAN only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_adhoc">
+    <comment></comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks_val_userdefine">
+    <comment></comment>        
+    <source>User-defined interval</source>
+    <translation variants="no">User-defined interval</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate">
+    <comment></comment>        
+    <source>Authority certificate</source>
+    <translation variants="no">Authority certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_33</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_cellular_cancel">
+    <comment>Cancel connection establishment.</comment>        
+    <source>Cancel</source>
+    <translation variants="no">Cancel</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_adhoc">
+    <comment>Network mode summary item: Ad-hoc</comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_client_certificate">
+    <comment></comment>        
+    <source>WAPI client certificate</source>
+    <translation variants="no">WAPI client certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_37</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_intranet">
+    <comment></comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_3">
+    <comment></comment>        
+    <source>WEP key #3</source>
+    <translation variants="no">WEP key #3</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_authority_certificate">
+    <comment></comment>        
+    <source>Select authority certificate:</source>
+    <translation variants="no">Select authority certificate:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_02</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name_val_vpn">
+    <comment>Setting value. Default name for VPN access point in case no name defined by user.</comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_on_hold">
+    <comment>Value for detail in details view.</comment>        
+    <source>On hold</source>
+    <translation variants="no">On hold</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_delete_snap">
+    <comment>Confirmation dialog. Confirms the deletion of a destination. %1 is the name of the destination, does not need localisation.</comment>        
+    <source>Delete &apos;%1&apos;?</source>
+    <translation variants="no">Delete &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_delete_snap</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_delete_vpn_policy">
+    <comment></comment>        
+    <source>Delete &apos;%1&apos;?</source>
+    <translation variants="no">Delete &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_delete_policy</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status">
+    <comment>Setting label. WLAN network status.</comment>        
+    <source>Network status</source>
+    <translation variants="no">Network status</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_speed">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Speed</source>
+    <translation variants="no">Speed</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_kb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 kB</source>
+    <translation variants="no">%1 kB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_activate_restrictions">
+    <comment></comment>        
+    <source>Activate restrictions</source>
+    <translation variants="no">Activate restrictions</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_connection_details">
+    <comment></comment>        
+    <source>Connection details</source>
+    <translation variants="no">Connection details</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_off">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is off.</comment>        
+    <source>WLAN is off</source>
+    <translation variants="no">WLAN is off</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_arrange">
+    <comment>View specific menu item. Sets the view to Arrange mode where drag-and-drop can be used to re-prioritise access points.</comment>        
+    <source>Arrange</source>
+    <translation variants="no">Arrange</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_realm">
+    <comment></comment>        
+    <source>Realm</source>
+    <translation variants="no">Realm</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_41</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_select_network_mode_and_status">
+    <comment></comment>        
+    <source>Select network mode (and status):</source>
+    <translation variants="no">Select network mode (and status):</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>dialog_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_server_address">
+    <comment>Setting label. Proxy server address (URI or IP address).</comment>        
+    <source>Proxy server address</source>
+    <translation variants="no">Proxy server address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_19</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wpawpa2">
+    <comment>Setting value. WLAN uses WPA/WPA2 security.</comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_select_network_security_mode">
+    <comment></comment>        
+    <source>Select network security mode:</source>
+    <translation variants="no">Select network security mode:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>dialog_7</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_no_certificates_found">
+    <comment></comment>        
+    <source>No certificates found</source>
+    <translation variants="no">No certificates found</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_01</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_internet_val_no_access_points">
+    <comment>List item, 2-row, secondary text. No access points defined in the destination in question.</comment>        
+    <source>No access points</source>
+    <translation variants="no">No access points</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2_3_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_wellknown">
+    <comment>Setting value. DNS addresses are well-known (standard-defined fixed addresses).</comment>        
+    <source>Well-known</source>
+    <translation variants="no">Well-known</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_infrastructure_public">
+    <comment></comment>        
+    <source>Public</source>
+    <translation variants="no">Public</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_show_unknown_networks">
+    <comment></comment>        
+    <source>Show unknown networks</source>
+    <translation variants="no">Show unknown networks</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_next">
+    <comment>Next toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Next</source>
+    <translation variants="no">Next</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_use">
+    <comment></comment>        
+    <source>WEP key in use</source>
+    <translation variants="no">WEP key in use</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_connection">
+    <comment></comment>        
+    <source>Select connection:</source>
+    <translation variants="no">Select connection:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_secondary_name_server">
+    <comment>Setting label. Secondary domain name server&apos;s (DNS) address.</comment>        
+    <source>Secondary name server</source>
+    <translation variants="no">Secondary name server</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_24</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving">
+    <comment></comment>        
+    <source>Power saving</source>
+    <translation variants="no">Power saving</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_connected_to_1">
+    <comment>Custom layout ID parent. Status of WLAN in WLAN list view. WLAN is on, and connected to access point name &apos;%1&apos;.</comment>        
+    <source>Connected to &apos;%1&apos;</source>
+    <translation variants="no">Connected to &apos;%1&apos;</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_notifications">
+    <comment></comment>        
+    <source>Notifications</source>
+    <translation variants="no">Notifications</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_42</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_total">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Total</source>
+    <translation variants="no">Total</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_duration">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Duration</source>
+    <translation variants="no">Duration</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_there_is_a_mismatch_between_the_selec">
+    <comment></comment>        
+    <source>There is a mismatch between the selected certificate and the certificate sent by server. Please verify certificate settings.</source>
+    <translation variants="no">There is a mismatch between the selected certificate and the certificate sent by server. Please verify certificate settings.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_eap_identity_for_1">
+    <comment></comment>        
+    <source>EAP identity for &apos;%1&apos;:</source>
+    <translation variants="no">EAP identity for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapsim_settings">
+    <comment></comment>        
+    <source>EAP-SIM settings</source>
+    <translation variants="no">EAP-SIM settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapfast_settings">
+    <comment></comment>        
+    <source>EAP-FAST settings</source>
+    <translation variants="no">EAP-FAST settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_subnet_mask">
+    <comment>Setting label.Subnet mask is used to define the IP address prefix common to all the devices in the subnet.</comment>        
+    <source>Subnet mask</source>
+    <translation variants="no">Subnet mask</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_21</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_unauthenticated_provisioning">
+    <comment></comment>        
+    <source>Unauthenticated provisioning</source>
+    <translation variants="no">Unauthenticated provisioning</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name">
+    <comment></comment>        
+    <source>User name</source>
+    <translation variants="no">User name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_40</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_destination_val_internet">
+    <comment>TODO: to be removed</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_port_number">
+    <comment>Setting label. Proxy server port number</comment>        
+    <source>Proxy port number</source>
+    <translation variants="no">Proxy port number</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_20</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapttls_settings">
+    <comment></comment>        
+    <source>EAP-TTLS settings</source>
+    <translation variants="no">EAP-TTLS settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wep">
+    <comment>Security mode summary item: WEP</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wpawpa2psk">
+    <comment>Security mode summary item: WPA with password</comment>        
+    <source>WPA with password</source>
+    <translation variants="no">WPA with password</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_known_wlan_networks">
+    <comment></comment>        
+    <source>Known WLAN networks</source>
+    <translation variants="no">Known WLAN networks</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_user_name">
+    <comment></comment>        
+    <source>User name:</source>
+    <translation variants="no">User name:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_53</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_wlan_is_on">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is on, but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapaka_settings">
+    <comment></comment>        
+    <source>EAP-AKA settings</source>
+    <translation variants="no">EAP-AKA settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_not_connected">
+    <comment>Indicator menu WLAN plugin value, WLAN on but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name">
+    <comment>Setting label. User-defined name for internet access point.</comment>        
+    <source>Connection name</source>
+    <translation variants="no">Connection name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_disconnecting">
+    <comment>Status of WLAN in WLAN list view. WLAN connection is being disconnected.</comment>        
+    <source>Disconnecting</source>
+    <translation variants="no">Disconnecting</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_homepage">
+    <comment>Setting label. Homepage for the internet access point.</comment>        
+    <source>Homepage</source>
+    <translation variants="no">Homepage</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_4">
+    <comment></comment>        
+    <source>#4</source>
+    <translation variants="no">#4</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_status_verified">
+    <comment></comment>        
+    <source>Status: verified</source>
+    <translation variants="no">Status: verified</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_check_connection_settings">
+    <comment></comment>        
+    <source>Check connection settings</source>
+    <translation variants="no">Check connection settings</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_switch_wlan_on">
+    <comment></comment>        
+    <source>Switch WLAN on</source>
+    <translation variants="no">Switch WLAN on</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wlan_settings">
+    <comment></comment>        
+    <source>WLAN settings</source>
+    <translation variants="no">WLAN settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode">
+    <comment>Setting label. WLAN network&apos;s security mode.</comment>        
+    <source>WLAN security mode</source>
+    <translation variants="no">WLAN security mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsarc4md5">
+    <comment></comment>        
+    <source>RSA,RC4,MD5</source>
+    <translation variants="no">RSA,RC4,MD5</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_good_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Good (%L1%)</source>
+    <translation variants="no">Good (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv1">
+    <comment></comment>        
+    <source>PEAPv1</source>
+    <translation variants="no">PEAPv1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_infrastructure_hidden">
+    <comment></comment>        
+    <source>Hidden</source>
+    <translation variants="no">Hidden</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_destinations_access_points">
+    <comment>Groupbox title. Destinations and access point settings.</comment>        
+    <source>Destinations &amp; access points</source>
+    <translation variants="no">Destinations &amp; access points</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_bearer">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Bearer</source>
+    <translation variants="no">Bearer</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wlan_setup_wizard_step_l1">
+    <comment>Heading for WLAN wizard</comment>        
+    <source>WLAN setup wizard, step %L1</source>
+    <translation variants="no">WLAN setup wizard, step %L1</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_details">
+    <comment>Item specific menu item. Opens a view where user can see the details for a WLAN network.</comment>        
+    <source>Details</source>
+    <translation variants="no">Details</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_reset_pac_store">
+    <comment></comment>        
+    <source>Reset PAC store</source>
+    <translation variants="no">Reset PAC store</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhersaaessha">
+    <comment></comment>        
+    <source>DHE-RSA,AES,SHA</source>
+    <translation variants="no">DHE-RSA,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy">
+    <comment></comment>        
+    <source>TLS privacy</source>
+    <translation variants="no">TLS privacy</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status_val_public">
+    <comment>Setting value. WLAN network is public (not hidden).</comment>        
+    <source>Public</source>
+    <translation variants="no">Public</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_gb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 GB</source>
+    <translation variants="no">%1 GB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_known_ne">
+    <comment></comment>        
+    <source>Known &amp; new</source>
+    <translation variants="no">Known &amp; new</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_confirm">
+    <comment></comment>        
+    <source>Confirm</source>
+    <translation variants="no">Confirm</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn_val_always">
+    <comment></comment>        
+    <source>Always</source>
+    <translation variants="no">Always</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_incomplete_details_return_without_sa">
+    <comment></comment>        
+    <source>Incomplete details. Return without saving?</source>
+    <translation variants="no">Incomplete details. Return without saving?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_02</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_adhoc_1">
+    <comment></comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_dedicated_access_point">
+    <comment></comment>        
+    <source>Dedicated access point</source>
+    <translation variants="no">Dedicated access point</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv0_or_peapv1">
+    <comment></comment>        
+    <source>PEAPv0 or PEAPv1</source>
+    <translation variants="no">PEAPv0 or PEAPv1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_via_1">
+    <comment></comment>        
+    <source>Via &apos;%1&apos;</source>
+    <translation variants="no">Via &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connecting</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_downloading_vpn_policy">
+    <comment></comment>        
+    <source>Downloading VPN policy</source>
+    <translation variants="no">Downloading VPN policy</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_policy_dl</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_2">
+    <comment></comment>        
+    <source>WEP key #2</source>
+    <translation variants="no">WEP key #2</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_realm">
+    <comment></comment>        
+    <source>Realm:</source>
+    <translation variants="no">Realm:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_54</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy_val_on">
+    <comment></comment>        
+    <source>On</source>
+    <translation variants="no">On</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format">
+    <comment></comment>        
+    <source>WEP key format</source>
+    <translation variants="no">WEP key format</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_pac_store">
+    <comment></comment>        
+    <source>PAC store</source>
+    <translation variants="no">PAC store</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access_val_enab">
+    <comment></comment>        
+    <source>Enabled</source>
+    <translation variants="no">Enabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_val_stay_in_fir">
+    <comment>Setting value. Device stays connected to the access point initially selected.</comment>        
+    <source>Stay in first</source>
+    <translation variants="no">Stay in first</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_download_failed">
+    <comment></comment>        
+    <source>Download failed</source>
+    <translation variants="no">Download failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_error_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy_val_off">
+    <comment></comment>        
+    <source>Off</source>
+    <translation variants="no">Off</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_outer_eap">
+    <comment></comment>        
+    <source>Outer EAP</source>
+    <translation variants="no">Outer EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpa_with_eap">
+    <comment></comment>        
+    <source>WPA with EAP</source>
+    <translation variants="no">WPA with EAP</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_received">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Received</source>
+    <translation variants="no">Received</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_certificate_val_not_in_use">
+    <comment></comment>        
+    <source>(not in use)</source>
+    <translation variants="no">(not in use)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_45_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_reject">
+    <comment></comment>        
+    <source>Reject</source>
+    <translation variants="no">Reject</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_operator_services">
+    <comment></comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_operator_services">
+    <comment>List item, 2-row, primary text. Name of the Operator services destination.</comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode">
+    <comment>Title for security mode summary item.</comment>        
+    <source>Security mode</source>
+    <translation variants="no">Security mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_mschapv2_settings">
+    <comment></comment>        
+    <source>MSCHAPv2 settings</source>
+    <translation variants="no">MSCHAPv2 settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn_val_when_needed">
+    <comment></comment>        
+    <source>When needed</source>
+    <translation variants="no">When needed</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_confirm_password">
+    <comment></comment>        
+    <source>Confirm password:</source>
+    <translation variants="no">Confirm password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_07</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_58</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data">
+    <comment></comment>        
+    <source>Cellular data</source>
+    <translation variants="no">Cellular data</translation>
+    <extra-loc-layout_id>qtl_indimenu_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dedicated_access_point">
+    <comment></comment>        
+    <source>Dedicated access point</source>
+    <translation variants="no">Dedicated access point</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_selection">
+    <comment>Setting label. Defines whether the device automatically roams to best signal strength WLAN access point between WLAN access points (base stations) having the same WLAN network name (SSID), or if it stays connected to the access point it initially selected.</comment>        
+    <source>WLAN base station selection</source>
+    <translation variants="no">WLAN base station selection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_inner_eap_type">
+    <comment></comment>        
+    <source>Configure inner EAP type</source>
+    <translation variants="no">Configure inner EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_1_connected">
+    <comment>Indicator menu WLAN plugin value, WLAN connected to access point %1 (parameter not localised).</comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_ip_address">
+    <comment>Heading for detail in details view.</comment>        
+    <source>IP address</source>
+    <translation variants="no">IP address</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_enter_access_pt_name_or_leave_blan">
+    <comment></comment>        
+    <source>Enter access pt. name or leave blank and press &apos;OK&apos; to add operator default:</source>
+    <translation variants="no">Enter access pt. name or leave blank and press &apos;OK&apos; to add operator default:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_acl_add_apn</extra-loc-viewid>
+    <extra-loc-positionid>dialog_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode_val_unauthentic">
+    <comment></comment>        
+    <source>Unauthenticated</source>
+    <translation variants="no">Unauthenticated</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status_val_hidden">
+    <comment>Setting value. WLAN network is hidden.</comment>        
+    <source>Hidden</source>
+    <translation variants="no">Hidden</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_tx_power">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Tx power</source>
+    <translation variants="no">Tx power</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_home_network">
+    <comment></comment>        
+    <source>Data usage in home network</source>
+    <translation variants="no">Data usage in home network</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_apn">
+    <comment>Heading for detail in details view.</comment>        
+    <source>APN</source>
+    <translation variants="no">APN</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_256bit_key">
+    <comment></comment>        
+    <source>256-bit key</source>
+    <translation variants="no">256-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_default_gateway">
+    <comment>Setting label. Default gateway defines the IP address of the router in a network using subnets.</comment>        
+    <source>Default gateway</source>
+    <translation variants="no">Default gateway</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_22</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpa_with_password">
+    <comment></comment>        
+    <source>WPA with password</source>
+    <translation variants="no">WPA with password</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_wlan_to_be_used_instead_of_ce">
+    <comment></comment>        
+    <source>Select WLAN to be used instead of cellular data.</source>
+    <translation variants="no">Select WLAN to be used instead of cellular data.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_settings_received_for_multiple_ne">
+    <comment></comment>        
+    <source>Settings received for multiple networks</source>
+    <translation variants="no">Settings received for multiple networks</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_access_point">
+    <comment></comment>        
+    <source>Access point</source>
+    <translation variants="no">Access point</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_9</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_signal_too_weak">
+    <comment></comment>        
+    <source>Signal too weak </source>
+    <translation variants="no">Signal too weak </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_issuer_1">
+    <comment></comment>        
+    <source>Issuer: &apos;%1&apos;</source>
+    <translation variants="no">Issuer: &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_certificate">
+    <comment></comment>        
+    <source>Certificate</source>
+    <translation variants="no">Certificate</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode_val_authenticat">
+    <comment></comment>        
+    <source>Authenticated</source>
+    <translation variants="no">Authenticated</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eaptls_settings">
+    <comment></comment>        
+    <source>EAP-TLS settings</source>
+    <translation variants="no">EAP-TLS settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_ssid">
+    <comment>Heading for detail in details view.</comment>        
+    <source>SSID</source>
+    <translation variants="no">SSID</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_name">
+    <comment>Custom layout ID parent. Title for network name summary item</comment>        
+    <source>Network name</source>
+    <translation variants="no">Network name</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_9</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_settings">
+    <comment></comment>        
+    <source>Network settings</source>
+    <translation variants="no">Network settings</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_19</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_mb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 MB</source>
+    <translation variants="no">%1 MB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password">
+    <comment></comment>        
+    <source>PAC store password</source>
+    <translation variants="no">PAC store password</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_secondary_dns">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Secondary DNS</source>
+    <translation variants="no">Secondary DNS</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_network_connection">
+    <comment></comment>        
+    <source>Network connection</source>
+    <translation variants="no">Network connection</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_primary_name_server_val_automatic">
+    <comment>Setting value. Primary DNS address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_23_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_connect_this_time">
+    <comment>Allow connection this time. Will prompt again next time.</comment>        
+    <source>Connect this time</source>
+    <translation variants="no">Connect this time</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_val_generate_automatic">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_53_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_manual">
+    <comment></comment>        
+    <source>Manual</source>
+    <translation variants="no">Manual</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_packet_data">
+    <comment>Value for detail in details view.</comment>        
+    <source>Packet data</source>
+    <translation variants="no">Packet data</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_previous">
+    <comment>Previous toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Previous</source>
+    <translation variants="no">Previous</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_eapfast">
+    <comment></comment>        
+    <source>EAP-FAST provisioning mode</source>
+    <translation variants="no">EAP-FAST provisioning mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_wlan_only">
+    <comment></comment>        
+    <source>WLAN only</source>
+    <translation variants="no">WLAN only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password_val_prompt">
+    <comment></comment>        
+    <source>Prompt</source>
+    <translation variants="no">Prompt</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_infrastructure_hi">
+    <comment></comment>        
+    <source>Infrastructure (hidden)</source>
+    <translation variants="no">Infrastructure (hidden)</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_notifications_val_show">
+    <comment></comment>        
+    <source>Show</source>
+    <translation variants="no">Show</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_42_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_show_all">
+    <comment></comment>        
+    <source>Show all...</source>
+    <translation variants="no">Show all...</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_network_settings">
+    <comment>Item specific menu item. Opens the access point settings view for the WLAN network.</comment>        
+    <source>Network settings</source>
+    <translation variants="no">Network settings</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_connected_to_1">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is connected to access point name &apos;%1&apos;.</comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access_val_disa">
+    <comment></comment>        
+    <source>Disabled</source>
+    <translation variants="no">Disabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format_val_hexadecimal">
+    <comment></comment>        
+    <source>Hexadecimal</source>
+    <translation variants="no">Hexadecimal</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_operator_services">
+    <comment></comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_innear_eap_type_for_1">
+    <comment></comment>        
+    <source>Select innear EAP type for &apos;%1&apos;:</source>
+    <translation variants="no">Select innear EAP type for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_04</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_1">
+    <comment></comment>        
+    <source>#1</source>
+    <translation variants="no">#1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses">
+    <comment>Setting label. Domain name servers&apos; (DNS) IP addresses.</comment>        
+    <source>DNS addresses</source>
+    <translation variants="no">DNS addresses</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_please_try_again">
+    <comment></comment>        
+    <source>Please try again </source>
+    <translation variants="no">Please try again </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan">
+    <comment>List item, 2-row, primary text. Name of the WLAN plug-in under Control Panel&apos;s &quot;Connectivity&quot; group.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapgtc_settings">
+    <comment></comment>        
+    <source>EAP-GTC settings</source>
+    <translation variants="no">EAP-GTC settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="yes" id="txt_occ_list_lnd_2">
+    <comment>Value for detail in details view.</comment>        
+    <source>%Lnd %2</source>
+    <translation>
+        <numerusform variants="no">(s)%Lnd %2</numerusform>
+        <numerusform variants="no">(p)%Lnd %2</numerusform>
+    </translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_8021x">
+    <comment>Setting value. WLAN uses 802.1X security.</comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_connection_unavailable">
+    <comment></comment>        
+    <source>Connection unavailable</source>
+    <translation variants="no">Connection unavailable</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_wlan_network_not_found">
+    <comment></comment>        
+    <source>WLAN network not found</source>
+    <translation variants="no">WLAN network not found</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_8021x_1">
+    <comment></comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_status_not_verified">
+    <comment></comment>        
+    <source>Status: not verified</source>
+    <translation variants="no">Status: not verified</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_download">
+    <comment></comment>        
+    <source>Download</source>
+    <translation variants="no">Download</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_unknown">
+    <comment></comment>        
+    <source>(unknown)</source>
+    <translation variants="no">(unknown)</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpawpa2">
+    <comment>Value for detail in details view.</comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_preshared_key_format">
+    <comment></comment>        
+    <source>Pre-shared key format</source>
+    <translation variants="no">Pre-shared key format</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_connecting">
+    <comment></comment>        
+    <source>Connecting</source>
+    <translation variants="no">Connecting</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connecting</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_realm_val_generate_automatically">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_41_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_open">
+    <comment>Setting value. WLAN network is open, no security.</comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_eap_type_settings">
+    <comment></comment>        
+    <source>EAP type settings</source>
+    <translation variants="no">EAP type settings</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_access_point_settings">
+    <comment>Groupbox title. Internet access point settings group.</comment>        
+    <source>Access point settings</source>
+    <translation variants="no">Access point settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name_val_connection">
+    <comment>Setting value. Default name for internet access point in case no name defined by user.</comment>        
+    <source>Connection</source>
+    <translation variants="no">Connection</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_connection_already_active">
+    <comment></comment>        
+    <source>Connection already active</source>
+    <translation variants="no">Connection already active</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_roaming">
+    <comment></comment>        
+    <source>Data usage when roaming</source>
+    <translation variants="no">Data usage when roaming</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version">
+    <comment></comment>        
+    <source>PEAP version</source>
+    <translation variants="no">PEAP version</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_dont_show_again">
+    <comment></comment>        
+    <source>Don&apos;t show again</source>
+    <translation variants="no">Don&apos;t show again</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_creating_connection">
+    <comment>Value for detail in details view.</comment>        
+    <source>Creating connection</source>
+    <translation variants="no">Creating connection</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode_val_infrastruct">
+    <comment>Setting value. WLAN network is based on WLAN base station, i.e. infrastructure.</comment>        
+    <source>Infrastructure</source>
+    <translation variants="no">Infrastructure</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_deactivate_restrictions">
+    <comment></comment>        
+    <source>Deactivate restrictions</source>
+    <translation variants="no">Deactivate restrictions</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_operator_services">
+    <comment>Simple label (groupbox). Name of the Operator services destination.</comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_accept">
+    <comment></comment>        
+    <source>Accept</source>
+    <translation variants="no">Accept</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2_val_eap">
+    <comment></comment>        
+    <source>EAP</source>
+    <translation variants="no">EAP</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_network">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Network</source>
+    <translation variants="no">Network</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_default_gateway_val_not_defined">
+    <comment>Setting value. Default gateway not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_22_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_activate_wlan_in_airplane_mode">
+    <comment></comment>        
+    <source>Activate WLAN in airplane mode?</source>
+    <translation variants="no">Activate WLAN in airplane mode?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_offline_mode_query</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2_val_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_64bit_key">
+    <comment></comment>        
+    <source>64-bit key</source>
+    <translation variants="no">64-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_eap_type">
+    <comment></comment>        
+    <source>Select EAP type:</source>
+    <translation variants="no">Select EAP type:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_01</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_service_not_available">
+    <comment></comment>        
+    <source>Service not available</source>
+    <translation variants="no">Service not available</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_error_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_type">
+    <comment></comment>        
+    <source>EAP type</source>
+    <translation variants="no">EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_35</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_use_only_known_networks">
+    <comment></comment>        
+    <source>Use only known networks</source>
+    <translation variants="no">Use only known networks</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_proxy_settings">
+    <comment>Groupbox title. Proxy server settings group.</comment>        
+    <source>Proxy settings</source>
+    <translation variants="no">Proxy settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_closing_connection">
+    <comment>Value for detail in details view.</comment>        
+    <source>Closing connection</source>
+    <translation variants="no">Closing connection</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type">
+    <comment></comment>        
+    <source>Authentication type</source>
+    <translation variants="no">Authentication type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_destination_name">
+    <comment>Input dialog. Name for a new destination.</comment>        
+    <source>Destination name:</source>
+    <translation variants="no">Destination name:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_snap</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_l1_b">
+    <comment>Value for detail in details view.</comment>        
+    <source>%L1 B</source>
+    <translation variants="no">%L1 B</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_connect_automatically">
+    <comment>Allow connecting automatically now and later (will change the appropriate setting under Control Panel).</comment>        
+    <source>Connect automatically</source>
+    <translation variants="no">Connect automatically</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_root_cert_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_38_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_permission_denied">
+    <comment></comment>        
+    <source>Permission denied </source>
+    <translation variants="no">Permission denied </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_service_unreachable">
+    <comment></comment>        
+    <source>Service unreachable</source>
+    <translation variants="no">Service unreachable</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wep_1">
+    <comment></comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection_val_automa">
+    <comment></comment>        
+    <source>Automatically</source>
+    <translation variants="no">Automatically</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsaaessha">
+    <comment></comment>        
+    <source>RSA,AES,SHA</source>
+    <translation variants="no">RSA,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapleap_settings">
+    <comment></comment>        
+    <source>EAP-LEAP settings</source>
+    <translation variants="no">EAP-LEAP settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection_val_when_n">
+    <comment></comment>        
+    <source>When needed</source>
+    <translation variants="no">When needed</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsarc4sha">
+    <comment></comment>        
+    <source>RSA,RC4,SHA</source>
+    <translation variants="no">RSA,RC4,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_connect_to_internet_using_cellular_d">
+    <comment>Confirmation dialog text. A cellular data connection is tried to be established (in home network). This may generate costs. User can accept the connection to be established automatically (will change appropriate setting value in Control Panel), only this time (will prompt again next time) or cancel the connection.</comment>        
+    <source>Connect to Internet using cellular data? Data costs may apply.</source>
+    <translation variants="no">Connect to Internet using cellular data? Data costs may apply.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular_home</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data_val_1_connected">
+    <comment></comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_there_are_no_certificates_installed">
+    <comment></comment>        
+    <source>There are no certificates installed. Wizard cannot continue with selected EAP type. Contact your administrator for assistance.</source>
+    <translation variants="no">There are no certificates installed. Wizard cannot continue with selected EAP type. Contact your administrator for assistance.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection">
+    <comment></comment>        
+    <source>Packet data connection</source>
+    <translation variants="no">Packet data connection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_messaging">
+    <comment></comment>        
+    <source>Messaging</source>
+    <translation variants="no">Messaging</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_infrastructure_pu">
+    <comment>Network mode summary item: Infrastructure (public)</comment>        
+    <source>Infrastructure (public)</source>
+    <translation variants="no">Infrastructure (public)</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_security">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Security</source>
+    <translation variants="no">Security</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_confirm">
+    <comment></comment>        
+    <source>Confirm</source>
+    <translation variants="no">Confirm</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_cellular_data_usage">
+    <comment></comment>        
+    <source>Cellular data usage</source>
+    <translation variants="no">Cellular data usage</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_configure_manually">
+    <comment></comment>        
+    <source>Configure manually</source>
+    <translation variants="no">Configure manually</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_gateway">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Gateway</source>
+    <translation variants="no">Gateway</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_wep_key">
+    <comment></comment>        
+    <source>Invalid WEP key</source>
+    <translation variants="no">Invalid WEP key</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wlan_setup_wizard_summary">
+    <comment>Heading for WLAN wizard, summary page</comment>        
+    <source>WLAN setup wizard, summary</source>
+    <translation variants="no">WLAN setup wizard, summary</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_primary_name_server">
+    <comment>Setting label. Primary domain name server&apos;s (DNS) address.</comment>        
+    <source>Primary name server</source>
+    <translation variants="no">Primary name server</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_23</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access">
+    <comment></comment>        
+    <source>High-speed packet access</source>
+    <translation variants="no">High-speed packet access</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_kbs">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 kB/s</source>
+    <translation variants="no">%1 kB/s</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_pac_store_password">
+    <comment></comment>        
+    <source>PAC store password:</source>
+    <translation variants="no">PAC store password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_08</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_59</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_homepage_val_none">
+    <comment>Setting value. Homepage has not been defined.</comment>        
+    <source>None</source>
+    <translation variants="no">None</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_16_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_packet_data">
+    <comment></comment>        
+    <source>Packet data</source>
+    <translation variants="no">Packet data</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks">
+    <comment></comment>        
+    <source>Join WLAN networks</source>
+    <translation variants="no">Join WLAN networks</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_delete_apn">
+    <comment></comment>        
+    <source>Delete APN</source>
+    <translation variants="no">Delete APN</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_internet">
+    <comment></comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_known_wlan_networks">
+    <comment></comment>        
+    <source>Known WLAN networks</source>
+    <translation variants="no">Known WLAN networks</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_settings_2</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_root_certificate">
+    <comment></comment>        
+    <source>WAPI root certificate</source>
+    <translation variants="no">WAPI root certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_38</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_authentication">
+    <comment></comment>        
+    <source>WAPI authentication</source>
+    <translation variants="no">WAPI authentication</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_indi_menu_wireless_lan">
+    <comment>Indicator menu WLAN plugin title.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_indimenu_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_input">
+    <comment></comment>        
+    <source>Invalid input</source>
+    <translation variants="no">Invalid input</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_server_name_val_verify">
+    <comment></comment>        
+    <source>Verify</source>
+    <translation variants="no">Verify</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_50_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format_val_ascii">
+    <comment></comment>        
+    <source>ASCII</source>
+    <translation variants="no">ASCII</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate_val_not_in">
+    <comment></comment>        
+    <source>(not in use)</source>
+    <translation variants="no">(not in use)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_insert_the_name_of_the_new_wlan_net">
+    <comment></comment>        
+    <source>Insert the name of the new WLAN network:</source>
+    <translation variants="no">Insert the name of the new WLAN network:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_1</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type_val_open">
+    <comment></comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_vpn_policy_download">
+    <comment></comment>        
+    <source>VPN policy download</source>
+    <translation variants="no">VPN policy download</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn">
+    <comment></comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_with_the_access_point_control_servic">
+    <comment></comment>        
+    <source>With the access point control service, packet data connections from your device may be restricted to certain access points only.</source>
+    <translation variants="no">With the access point control service, packet data connections from your device may be restricted to certain access points only.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_user_certificate">
+    <comment></comment>        
+    <source>Select user certificate:</source>
+    <translation variants="no">Select user certificate:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_06</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_8021x">
+    <comment></comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_password">
+    <comment></comment>        
+    <source>Password</source>
+    <translation variants="no">Password</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_43</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving_val_enabled">
+    <comment></comment>        
+    <source>Enabled</source>
+    <translation variants="no">Enabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_internet">
+    <comment>List item, 2-row, primary text. Name of the Internet destination.</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_authenticated_provisioning">
+    <comment></comment>        
+    <source>Authenticated provisioning</source>
+    <translation variants="no">Authenticated provisioning</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_connect_to_internet_in_this_country">
+    <comment>Confirmation dialog text. A cellular data connection is tried to be established outside of home network (i.e. when roaming). This may considerably increase data costs. User can accept the connection this time or reject it. User must go to Control Panel&apos;s connection settings and adjust setting related to data usage abroadto allow automatic connections without confirmations.</comment>        
+    <source>Connect to Internet using cellular data? Phone is outside of home network, and data costs may increase considerably. To allow connecting automatically, adjust the Connection settings.</source>
+    <translation variants="no">Connect to Internet using cellular data? Phone is outside of home network, and data costs may increase considerably. To allow connecting automatically, adjust the Connection settings.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular_abroad</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_automatic">
+    <comment>Setting value. DNS addresses are fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_disable_network">
+    <comment>Item specific menu item. Disables the selected network (i.e. network is not used in automatic connection selection).</comment>        
+    <source>Disable network</source>
+    <translation variants="no">Disable network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_server_1">
+    <comment></comment>        
+    <source>Server: &apos;%1&apos;</source>
+    <translation variants="no">Server: &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_hide_unknown_networks">
+    <comment></comment>        
+    <source>Hide unknown networks</source>
+    <translation variants="no">Hide unknown networks</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_security_settings">
+    <comment></comment>        
+    <source>Security settings</source>
+    <translation variants="no">Security settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_server_name">
+    <comment></comment>        
+    <source>Server name</source>
+    <translation variants="no">Server name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_50</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_internet">
+    <comment></comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_5</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_open">
+    <comment>Custom layout ID parent. Security mode summary item: Open</comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_selected_network_supports_wifi_prote">
+    <comment></comment>        
+    <source>Selected network supports Wi-Fi Protected Setupâ„¢ for receiving settings automatically. First, press button on wireless station to initiate the setup process, then select &apos;Continue&apos;.</source>
+    <translation variants="no">Selected network supports Wi-Fi Protected Setupâ„¢ for receiving settings automatically. First, press button on wireless station to initiate the setup process, then select &apos;Continue&apos;.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_ascii">
+    <comment></comment>        
+    <source>ASCII</source>
+    <translation variants="no">ASCII</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_subnet_mask_val_not_defined">
+    <comment>Setting value. Subnet mask not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_21_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_certificate">
+    <comment></comment>        
+    <source>Certificate</source>
+    <translation variants="no">Certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_add_destination">
+    <comment>Action button. Adds a new destination.</comment>        
+    <source>Add destination</source>
+    <translation variants="no">Add destination</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_sim_card_missing">
+    <comment></comment>        
+    <source>SIM card missing </source>
+    <translation variants="no">SIM card missing </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_2">
+    <comment></comment>        
+    <source>#2</source>
+    <translation variants="no">#2</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_unencrypted_connection">
+    <comment></comment>        
+    <source>Unencrypted connection</source>
+    <translation variants="no">Unencrypted connection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_62</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_policy_server_address">
+    <comment></comment>        
+    <source>Policy server address</source>
+    <translation variants="no">Policy server address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_61</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode_val_adhoc">
+    <comment>Setting value. WLAN network is formed between two devices without a base station.</comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhedssaessha">
+    <comment></comment>        
+    <source>DHE-DSS,AES,SHA</source>
+    <translation variants="no">DHE-DSS,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type_val_shared">
+    <comment></comment>        
+    <source>Shared</source>
+    <translation variants="no">Shared</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_adhoc_channel">
+    <comment>Setting label. WLAN ad-hoc network&apos;s channel number.</comment>        
+    <source>Ad-hoc channel</source>
+    <translation variants="no">Ad-hoc channel</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_25</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_pap_settings">
+    <comment></comment>        
+    <source>PAP settings</source>
+    <translation variants="no">PAP settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks">
+    <comment></comment>        
+    <source>Scan for networks</source>
+    <translation variants="no">Scan for networks</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_acl">
+    <comment></comment>        
+    <source>ACL</source>
+    <translation variants="no">ACL</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_inner_eap_type">
+    <comment></comment>        
+    <source>Inner EAP type</source>
+    <translation variants="no">Inner EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_47</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_certificate">
+    <comment></comment>        
+    <source>User certificate</source>
+    <translation variants="no">User certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_45</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_new_pac_store_password">
+    <comment></comment>        
+    <source>New PAC store password:</source>
+    <translation variants="no">New PAC store password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_07</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_57</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_configuring_connection_settings">
+    <comment></comment>        
+    <source>Configuring connection settings</source>
+    <translation variants="no">Configuring connection settings</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_03</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_intranet">
+    <comment></comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_7</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_not_available">
+    <comment>Value for detail in details view.</comment>        
+    <source>Not available</source>
+    <translation variants="no">Not available</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_primary_dns">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Primary DNS</source>
+    <translation variants="no">Primary DNS</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_signal">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Signal</source>
+    <translation variants="no">Signal</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_mode">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Mode</source>
+    <translation variants="no">Mode</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_l1_mw">
+    <comment>Value for detail in details view.</comment>        
+    <source>%L1 mW</source>
+    <translation variants="no">%L1 mW</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_no_vpn_policies_installed">
+    <comment></comment>        
+    <source>No VPN policies installed.</source>
+    <translation variants="no">No VPN policies installed.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_open_network">
+    <comment>Value for detail in details view.</comment>        
+    <source>Open network</source>
+    <translation variants="no">Open network</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key">
+    <comment></comment>        
+    <source>WEP key</source>
+    <translation variants="no">WEP key</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_31</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_closed">
+    <comment>Value for detail in details view.</comment>        
+    <source>Closed</source>
+    <translation variants="no">Closed</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhedss3dessha">
+    <comment></comment>        
+    <source>DHE-DSS,3DES,SHA</source>
+    <translation variants="no">DHE-DSS,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_sent">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Sent</source>
+    <translation variants="no">Sent</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_cancel">
+    <comment>Cancel toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Cancel</source>
+    <translation variants="no">Cancel</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_name">
+    <comment>Custom layout ID parent. Heading for detail in details view.</comment>        
+    <source>Name</source>
+    <translation variants="no">Name</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_known">
+    <comment></comment>        
+    <source>Known</source>
+    <translation variants="no">Known</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_client_cert_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_37_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_adhoc_channel_val_automatic">
+    <comment>Setting value. WLAN ad-hoc networ channel is determined automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_25_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_settings_received_for_multiple_wlan_n">
+    <comment></comment>        
+    <source>Settings received for multiple WLAN networks. Select the network to connect to:</source>
+    <translation variants="no">Settings received for multiple WLAN networks. Select the network to connect to:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_05</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_select_automatically">
+    <comment></comment>        
+    <source>Select automatically</source>
+    <translation variants="no">Select automatically</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wireless_lan">
+    <comment></comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving_val_disabled">
+    <comment></comment>        
+    <source>Disabled</source>
+    <translation variants="no">Disabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_connected_inactive">
+    <comment>Value for detail in details view.</comment>        
+    <source>Connected (inactive)</source>
+    <translation variants="no">Connected (inactive)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_new_wlan_networks_found">
+    <comment></comment>        
+    <source>New WLAN networks found:</source>
+    <translation variants="no">New WLAN networks found:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_connection_failed">
+    <comment></comment>        
+    <source>Connection failed</source>
+    <translation variants="no">Connection failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_intranet">
+    <comment>List item, 2-row, primary text. Name of the Intranet destination.</comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_4</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_searching">
+    <comment></comment>        
+    <source>Searching</source>
+    <translation variants="no">Searching</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_6</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_password_val_prompt">
+    <comment></comment>        
+    <source>Prompt</source>
+    <translation variants="no">Prompt</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_43_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_destination_val_uncategorized">
+    <comment>TODO: to be removed</comment>        
+    <source>Uncategorized</source>
+    <translation variants="no">Uncategorized</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_port_number_val_not_define">
+    <comment>Setting value. Proxy server port number not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_20_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_priority_l1">
+    <comment>List item, 2-row, secondary text. Priority of an access point. %L1 is the priority number (1-n).</comment>        
+    <source>Priority: %L1</source>
+    <translation variants="no">Priority: %L1</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode">
+    <comment>Setting label. WLAN network mode.</comment>        
+    <source>WLAN network mode</source>
+    <translation variants="no">WLAN network mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_automatic">
+    <comment>Setting value. IP address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_17_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_preshared_key_val_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_33_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_4">
+    <comment></comment>        
+    <source>WEP key #4</source>
+    <translation variants="no">WEP key #4</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_switch_wlan_off">
+    <comment></comment>        
+    <source>Switch WLAN off</source>
+    <translation variants="no">Switch WLAN off</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_certificate_mismatch">
+    <comment></comment>        
+    <source>Certificate mismatch</source>
+    <translation variants="no">Certificate mismatch</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wpa2_only">
+    <comment>Setting value. WLAN uses WPA2-only security.</comment>        
+    <source>WPA2 only</source>
+    <translation variants="no">WPA2 only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_user_defined">
+    <comment>Setting value. DNS addresses are user-defined.</comment>        
+    <source>User defined</source>
+    <translation variants="no">User defined</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_password">
+    <comment></comment>        
+    <source>Password:</source>
+    <translation variants="no">Password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_56</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_arrange">
+    <comment>Toolbar button. Sets the view to Arrange mode where drag-and-drop can be used to re-prioritise access points.</comment>        
+    <source>Arrange</source>
+    <translation variants="no">Arrange</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_for_1">
+    <comment></comment>        
+    <source>User name for &apos;%1&apos;:</source>
+    <translation variants="no">User name for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_55</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_uncategorized">
+    <comment>List item, 2-row, primary text. Name of the group of uncategorized access points not belonging to any destination.</comment>        
+    <source>Uncategorized</source>
+    <translation variants="no">Uncategorized</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_8021x">
+    <comment>Value for detail in details view.</comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_server_address_val_not_def">
+    <comment>Setting value. Proxy server address not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_19_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_3">
+    <comment></comment>        
+    <source>#3</source>
+    <translation variants="no">#3</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_status">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Status</source>
+    <translation variants="no">Status</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_enter_key_for_1">
+    <comment>Title for WLAN key query in wizard</comment>        
+    <source>Enter key for &apos;%1&apos;:</source>
+    <translation variants="no">Enter key for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_4</extra-loc-viewid>
+    <extra-loc-positionid>dialog_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_inner_eap">
+    <comment></comment>        
+    <source>Inner EAP</source>
+    <translation variants="no">Inner EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_17</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_share_to_other_destination">
+    <comment>Item specific menu item. Shares the selected access point to another destination, i.e. creates a virtual copy.</comment>        
+    <source>Share to other destination</source>
+    <translation variants="no">Share to other destination</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_enter_l1_on_wireless_station_then">
+    <comment></comment>        
+    <source>Enter &apos;%L1&apos; on wireless station then select &apos;Continue&apos;.</source>
+    <translation variants="no">Enter &apos;%L1&apos; on wireless station then select &apos;Continue&apos;.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_02</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode">
+    <comment></comment>        
+    <source>Provisioning mode</source>
+    <translation variants="no">Provisioning mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wpawpa2_with_eap">
+    <comment></comment>        
+    <source>WPA with EAP</source>
+    <translation variants="no">WPA with EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_infrastructure">
+    <comment>Value for detail in details view.</comment>        
+    <source>Infrastructure</source>
+    <translation variants="no">Infrastructure</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_intranet">
+    <comment>Simple label (groupbox). Name of the Intranet destination.</comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wapi">
+    <comment>Setting value. WLAN uses WAPI security.</comment>        
+    <source>WAPI</source>
+    <translation variants="no">WAPI</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption">
+    <comment></comment>        
+    <source>WEP encryption</source>
+    <translation variants="no">WEP encryption</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_web_feeds">
+    <comment></comment>        
+    <source>Web feeds</source>
+    <translation variants="no">Web feeds</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_ignore">
+    <comment></comment>        
+    <source>Ignore</source>
+    <translation variants="no">Ignore</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="yes" id="txt_occ_dblist_internet_val_ln_access_points">
+    <comment>List item, 2-row, secondary text. Number of access points (%Ln) defined in the destination in question.</comment>        
+    <source>%Ln access points</source>
+    <translation>
+        <numerusform variants="no">(s)%Ln access points</numerusform>
+        <numerusform variants="no">(p)%Ln access points</numerusform>
+    </translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2_3_4_16_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_hexadecimal">
+    <comment></comment>        
+    <source>Hexadecimal</source>
+    <translation variants="no">Hexadecimal</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_authentication_unsuccessful">
+    <comment></comment>        
+    <source>Authentication unsuccessful</source>
+    <translation variants="no">Authentication unsuccessful</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_no_settings_received">
+    <comment></comment>        
+    <source>No settings received</source>
+    <translation variants="no">No settings received</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_name">
+    <comment>Setting label. WLAN network name (SSID). Label has no localisable values.</comment>        
+    <source>WLAN network name</source>
+    <translation variants="no">WLAN network name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_12</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_use_pin_code_instead">
+    <comment></comment>        
+    <source>Use PIN code instead</source>
+    <translation variants="no">Use PIN code instead</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_remove_apn">
+    <comment></comment>        
+    <source>Remove &apos;%1&apos;?</source>
+    <translation variants="no">Remove &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_acl_remove_apn</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password_val_user_defin">
+    <comment></comment>        
+    <source>User defined</source>
+    <translation variants="no">User defined</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_characters_in_wep_key">
+    <comment></comment>        
+    <source>Invalid characters in WEP key</source>
+    <translation variants="no">Invalid characters in WEP key</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_open">
+    <comment></comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_tap_on_a_policy_to_set_a_default">
+    <comment></comment>        
+    <source>Tap on a policy to set a default.</source>
+    <translation variants="no">Tap on a policy to set a default.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2">
+    <comment></comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_internet">
+    <comment>Simple label (groupbox). Name of the Internet destination.</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_connecting_to_1">
+    <comment>Status of WLAN in WLAN list view. WLAN is on, and connection establishment is in progress to access point name &apos;%1&apos;.</comment>        
+    <source>Connecting to &apos;%1&apos;</source>
+    <translation variants="no">Connecting to &apos;%1&apos;</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data_val_l1_connections">
+    <comment></comment>        
+    <source>%L1 connections</source>
+    <translation variants="no">%L1 connections</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_move_to_other_destination">
+    <comment>Item specific menu item. Moves the selected access point to another destination.</comment>        
+    <source>Move to other destination</source>
+    <translation variants="no">Move to other destination</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_used_by">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Used by</source>
+    <translation variants="no">Used by</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_val_generate_automatica">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_40_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_access_point">
+    <comment></comment>        
+    <source>Select access point:</source>
+    <translation variants="no">Select access point:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_2</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapmschapv2_settings">
+    <comment></comment>        
+    <source>EAP-MSCHAPv2 settings</source>
+    <translation variants="no">EAP-MSCHAPv2 settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_secondary_name_server_val_automat">
+    <comment>Setting value. Secondary DNS address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_24_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_val_roam_to_bes">
+    <comment>Setting value. Device roams to best signal strength WLAN access point.</comment>        
+    <source>Roam to best</source>
+    <translation variants="no">Roam to best</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_val_authentic">
+    <comment></comment>        
+    <source>Authenticated</source>
+    <translation variants="no">Authenticated</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_settings_received_for_1_networ">
+    <comment></comment>        
+    <source>Settings received for &apos;%1&apos; network</source>
+    <translation variants="no">Settings received for &apos;%1&apos; network</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate_val_select">
+    <comment></comment>        
+    <source>Select automatically</source>
+    <translation variants="no">Select automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_check_security_key">
+    <comment></comment>        
+    <source>Check security key</source>
+    <translation variants="no">Check security key</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_disconnect_from">
+    <comment></comment>        
+    <source>Maximum number of connections in use. Close an active connection first.</source>
+    <translation variants="no">Maximum number of connections in use. Close an active connection first.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_not_connected">
+    <comment>Status of WLAN in WLAN list view. WLAN is on, but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wep">
+    <comment>Setting value. WLAN uses WEP security.</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_vpn">
+    <comment></comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_preshared_key_too_short_at_least_8">
+    <comment></comment>        
+    <source>Pre-shared key too short. At least 8 characters must be entered.</source>
+    <translation variants="no">Pre-shared key too short. At least 8 characters must be entered.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_internal_error">
+    <comment></comment>        
+    <source>Internal error </source>
+    <translation variants="no">Internal error </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_val_unauthent">
+    <comment></comment>        
+    <source>Unauthenticated</source>
+    <translation variants="no">Unauthenticated</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_1">
+    <comment></comment>        
+    <source>WEP key #1</source>
+    <translation variants="no">WEP key #1</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wep">
+    <comment>Value for detail in details view.</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_add_new_wlan">
+    <comment></comment>        
+    <source>Add new WLAN</source>
+    <translation variants="no">Add new WLAN</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_expires">
+    <comment></comment>        
+    <source>Expires: %1</source>
+    <translation variants="no">Expires: %1</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_continue">
+    <comment></comment>        
+    <source>Continue</source>
+    <translation variants="no">Continue</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_enable_network">
+    <comment></comment>        
+    <source>Enable network</source>
+    <translation variants="no">Enable network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wireless_lan">
+    <comment>Value for detail in details view.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_finish">
+    <comment>finish toolbutton for WLAN wizard summary page</comment>        
+    <source>Finish</source>
+    <translation variants="no">Finish</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_connected_active">
+    <comment>Custom layout ID parent. Value for detail in details view.</comment>        
+    <source>Connected (active)</source>
+    <translation variants="no">Connected (active)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+</context>
+</TS>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/rom/cpwpa2ui.iby	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef CPWPA2UI_IBY
+#define CPWPA2UI_IBY
+
+#include <data_caging_paths_for_iby.hrh>
+#include <bldvariant.hrh>
+
+file=ABI_DIR/BUILD_DIR/cpwpa2ui.dll SHARED_LIB_DIR/cpwpa2ui.dll
+data=/epoc32/data/c/resource/qt/plugins/controlpanel/wlansecurity/cpwpa2ui.qtplugin resource/qt/plugins/controlpanel/wlansecurity/cpwpa2ui.qtplugin
+
+
+#endif // CPWPA2UI_IBY
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/src/cpwpa2ui.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,307 @@
+/* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Control Panel QT UI for WPA2 only configuration
+ *
+ */
+
+/*
+ * %version: 17 %
+ */
+
+// User includes
+#include "cpwpa2ui.h"
+#include "cpwpacmnui.h"
+#include "wpa2keyvalidator.h"
+
+// System includes
+#include <HbDeviceNotificationDialog>
+#include <cmmanagerdefines_shim.h>
+#include <cmconnectionmethod_shim.h>
+#include <eapqtconfiginterface.h>
+#include <QStringList>
+#include <QLocale>
+#include <QCoreApplication>
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpwpa2uiTraces.h"
+#endif
+
+
+// Constants
+//The order in which WPA2 only mode appears in the list of available 
+//security mode
+const int UI_ORDER_WPA2_ONLY = 50;
+
+/*!
+ \class CpWpa2Ui
+ \brief CpWpa2Ui implements the  Ui for WPA2 only 
+ Security Settings Control Panel Plugin,
+ which will allow viewing/editing of WPA2 only Security Settings.
+ */
+//Contructs WPA2 object
+CpWpa2Ui::CpWpa2Ui() :
+    mUi(NULL),  mCmCM(NULL), mEapQtConfigInterface(NULL),
+            mWpa2Ui(NULL)
+{
+    mTranslator = new QTranslator(this);
+    mTranslator->load(":/loc/wlan_en_GB.qm");
+
+    qApp->installTranslator(mTranslator);
+    
+    /*mTranslator = QSharedPointer<HbTranslator> (
+               new HbTranslator("wlan_en_GB"));*/
+
+}
+
+//Deletes all objects WPA2 owns
+CpWpa2Ui::~CpWpa2Ui()
+{
+    OstTraceFunctionEntry1(CPWPA2UI_CPWPA2UI_ENTRY,this);
+    //delete mEapQtConfigInterface;
+    OstTraceFunctionExit1(CPWPA2UI_CPWPA2UI_EXIT,this);
+}
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ Getter for security mode.
+
+ \return Security mode identifier
+ */
+CMManagerShim::WlanSecMode CpWpa2Ui::securityMode() const
+{
+    OstTraceFunctionEntry1(CPWPA2UI_MODE_ENTRY,this);
+    OstTraceFunctionExit1(CPWPA2UI_MODE_EXIT,this);
+    //return security mode
+    return CMManagerShim::WlanSecModeWpa2;
+}
+
+/*!
+ Getter for localization text identifier for the security mode,
+ f.ex. "txt_occ_setlabel_wlan_security_mode_val_wpa2_only". This localized
+ text will be shown in the UI.
+ 
+ \return Localization text ID
+ */
+QString CpWpa2Ui::securityModeTextId() const
+{
+    OstTraceFunctionEntry1(CPWPA2UI_LOCALIZATIONID_ENTRY,this);
+    OstTraceFunctionExit1(CPWPA2UI_LOCALIZATIONID_EXIT,this);
+    return "txt_occ_setlabel_wlan_security_mode_val_wpa2_only";
+}
+
+/*! 
+ Sets the database reference (WLAN Service Table ID).
+
+ \param id Database reference
+ */
+void CpWpa2Ui::setReference(CmConnectionMethodShim *cmCm, uint id)
+{
+    OstTraceFunctionEntry1(CPWPA2UI_SETREFERENCE_ENTRY,this);
+    // Assuming that id is the connection method Id/IAP Id.
+
+    mCmId = id;
+
+    /*if (!mEapQtConfigInterface) {
+        mEapQtConfigInterface = new EapQtConfigInterface(
+                EapQtConfigInterface::EapBearerTypeWlan, mCmId);
+        //fix, hangs
+    }*/
+
+    //mCmCM is not deleted assuming mCmManager owns it.
+    mCmCM = cmCm;
+    OstTraceFunctionExit1(CPWPA2UI_SETREFERENCE_EXIT,this);
+}
+
+/*!
+ Getter for order number. This order number is used by the client of
+ this interface to put the security modes in correct order in the list.
+
+ \return An order number
+ */
+int CpWpa2Ui::orderNumber() const
+{
+    OstTraceFunctionEntry1(CPWPA2UI_ORDERNUMBER_ENTRY,this);
+    OstTraceFunctionExit1(CPWPA2UI_ORDERNUMBER_EXIT,this);
+    return UI_ORDER_WPA2_ONLY;
+}
+
+/*!
+ Creates an UI instance. Caller owns the object.
+ 
+ \param dataHelper Item data helper
+ \return Pointer to an UI object
+ */
+CpSettingFormItemData* CpWpa2Ui::uiInstance(CpItemDataHelper &dataHelpper)
+{
+    OstTraceFunctionEntry1(CPWPA2UI_UIINSTANCE_ENTRY,this);
+
+		//reset the Common Ui Ptr
+    mWpa2Ui.reset(new CpWpaCmnUi(CMManagerShim::WlanSecModeWpa2, dataHelpper));
+
+    mUi = mWpa2Ui->createUi(mEapQtConfigInterface, mCmCM);
+
+    connect(mWpa2Ui.data(), SIGNAL(keyChanged(QString&)), this,
+            SLOT(pskKeyChanged(QString&)));
+
+    connect(mWpa2Ui.data(), SIGNAL(pskEapModeToggled(int)), this,
+            SLOT(wpaTypeChanged(int)));
+
+    connect(mWpa2Ui.data(), SIGNAL(eapPluginChanged(int)), this,
+            SLOT(currentEapPlugin(int)));
+
+    OstTraceFunctionExit1(CPWPA2UI_UIINSTANCE_EXIT,this);
+    return mUi;
+}
+
+// ======== LOCAL FUNCTIONS ========
+/*!
+ Slot to handle change in wpa mode :- PSK /EAP
+
+ \param pskEnable the current mode chosen
+ */
+/*void CpWpa2Ui::wpaTypeChanged(int pskEnable)
+{
+    int err;
+    OstTraceFunctionEntry1(CPWPA2UI_WPATYPECHANGED_ENTRY,this);
+
+    bool PskEnable = pskEnable ? ETrue : EFalse;
+
+    QT_TRYCATCH_ERROR(err,mCmCM->setBoolAttribute(CMManagerShim::WlanEnableWpaPsk, PskEnable));
+
+    if(err !=KErrNone) {
+          OstTrace1( TRACE_ERROR, CPWPA2UI_WPATYPECHANGED, "ERROR WPA2 only:wpatypereturned returned %d", err );
+    }
+    tryUpdate();
+    OstTraceFunctionExit1(CPWPA2UI_WPATYPECHANGED_EXIT,this);
+}*/
+
+/*!
+ Slot to handle change in pre-shared key string
+
+ \param key changed string for PSK
+ */
+void CpWpa2Ui::pskKeyChanged(QString &key)
+{
+    int err;
+    OstTraceFunctionEntry1(CPWPA2UI_PSKKEYCHANGED_ENTRY,this);
+
+    //Check for Validity of Pre-shared Key
+    Wpa2KeyValidator::KeyStatus keystatus = Wpa2KeyValidator::validateWpa2Key(key);
+    
+    if (keystatus == Wpa2KeyValidator::KeyStatusOk) {
+        QT_TRYCATCH_ERROR(err, mCmCM->setString8Attribute(CMManagerShim::WlanWpaPreSharedKey, key));
+        if(err !=KErrNone) {
+                 OstTrace1( TRACE_ERROR, CPWPA2UI_PSKKEYCHANGED, "ERROR WPA2 only: pskKeyChanged returned %d", err );
+        }
+        tryUpdate();
+    }
+    
+    else {
+    showMessageBox(HbMessageBox::MessageTypeWarning, hbTrId(
+                   "txt_occ_info_invalid_input"));
+    }
+    OstTraceFunctionExit1(CPWPA2UI_PSKKEYCHANGED_EXIT,this);
+}
+
+/*!
+ Slot to handle change in eap method in use
+ \param currentplugin plugin number to indicate the
+ eap method in use
+ */
+/*void CpWpa2Ui::currentEapPlugin(int  currentPlugin  )
+{
+    OstTraceFunctionEntry1(CPWPA2UI_CURRENTEAPPLUGIN_ENTRY,this);
+
+    // define enum to store the current EAP type
+    //mCmCM->setIntAttribute( use appropriate enum to get the eap plugin index );
+    OstTraceFunctionExit1(CPWPA2UI_CURRENTEAPPLUGIN_EXIT,this);
+}*/
+
+bool CpWpa2Ui::tryUpdate()
+{
+    OstTraceFunctionEntry1(CPWPA2UI_TRYUPDATE_ENTRY,this);
+    
+    // Try update
+    try {
+        mCmCM->update();
+    }
+    catch (const std::exception&) {
+        // Handle error
+        handleUpdateError();
+        
+        OstTraceFunctionExit1(CPWPA2UI_TRYUPDATE_EXIT,this);
+        return false;
+    }
+
+    OstTraceFunctionExit1(DUP1_CPWPA2UI_TRYUPDATE_EXIT,this);
+    return true;
+}
+
+/*!
+    Handles failed CommsDat update.
+ */
+void CpWpa2Ui::handleUpdateError()
+{
+    OstTraceFunctionEntry1(CPWPA2UI_HANDLEUPDATEERROR_ENTRY,this);
+    
+    // Show error note to user
+    showMessageBox(
+        HbMessageBox::MessageTypeWarning,
+        hbTrId("txt_occ_info_unable_to_save_setting"));
+    // Reload settings from CommsDat and update UI
+    try {
+        mCmCM->refresh();
+    }
+    catch (const std::exception&) {
+        // Ignore error from refresh. Most likely this will not happen, but
+        // if it does, there isn't very much we can do.
+        OstTrace0(
+            TRACE_ERROR,
+            CPWPA2UI_HANDLEUPDATEERROR,
+            "Refresh failed");
+    };
+    updateWpaSettings();
+    
+    OstTraceFunctionExit1(CPWPA2UI_HANDLEUPDATEERROR_EXIT,this);
+}
+
+/*!
+    Shows message box with "OK" button using given text.
+*/
+void CpWpa2Ui::showMessageBox(
+    HbMessageBox::MessageBoxType type,
+    const QString &text)
+{
+    OstTraceFunctionEntry1(CPWPA2UI_SHOWMESSAGEBOX_ENTRY,this);
+    
+    // Create a message box
+    mMessageBox = QSharedPointer<HbMessageBox>(new HbMessageBox(type));
+    mMessageBox->setText(text);
+    mMessageBox->open();
+    
+    OstTraceFunctionExit1(CPWPA2UI_SHOWMESSAGEBOX_EXIT,this);
+}
+
+
+void CpWpa2Ui::updateWpaSettings()
+    {
+    OstTraceFunctionEntry1(CPWPA2UI_UPDATEWPASETTINGS_ENTRY,this);
+    mWpa2Ui->reset();
+    OstTraceFunctionExit1(CPWPA2UI_UPDATEWPASETTINGS_EXIT,this);
+    }
+
+Q_EXPORT_PLUGIN2(CpWpa2Ui, CpWpa2Ui)
+;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/src/wpa2keyvalidator.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   Validate WPA2 only keys
+ *
+ */
+/*
+ * %version: 1 %
+ */
+
+#include <QString>
+#include "wpa2keyvalidator.h"
+
+/*!
+    \class Wpa2KeyValidator wpa2keyvalidator.cpp
+    \brief Utilities for WPA2 only key validations.
+    
+*/
+/*!
+    \enum Wpa2KeyValidator::KeyStatus
+    This enum defines the validation results.
+
+    \var Wpa2KeyValidator::KeyStatusOk
+    Key is valid.
+    
+    \var Wpa2KeyValidator::KeyStatusIllegalCharacters
+    Key contains illegal characters.
+    
+    \var Wpa2KeyValidator::KeyStatusWpa2TooShort
+    WPA key is too short. Minimum allowed length is 8. See 
+    WlanWizardUtils::validateWpaKey().
+    
+    \var Wpa2KeyValidator::KeyStatusWpa2TooLong
+    WPA key is too long. Minimum allowed length is 64 for hex key and 63 for 
+    ascii key. See WlanWizardUtils::validateWpaKey().
+*/
+
+/*! 
+ * Process WPA2 key validation. A passphrase can contain from 8 to 63 ASCII
+ * characters where each character MUST have a decimal encoding in the range of
+ * 32 to 126, inclusive.
+ *
+ * A preshared key is stored as 64 character hex string.
+ * 
+ * @param key PSK to be validated
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ * - KeyStatusWpa2TooShort
+ * - KeyStatusWpa2TooLong
+ */
+Wpa2KeyValidator::KeyStatus Wpa2KeyValidator::validateWpa2Key(const QString &key)
+{
+    int length = key.length();
+    KeyStatus ret = KeyStatusOk;
+
+    if (length < Wpa2MinLenght) {
+        ret = KeyStatusWpa2TooShort;
+    }
+    else if (length > Wpa2MaxLenght) {
+        ret = KeyStatusWpa2TooLong;
+    }
+    // hex string
+    else if (length == Wpa2MaxLenght) {
+        ret = isHex(key);
+    }
+    else {
+        ret = isAscii(key);
+    }
+
+    return ret;
+}
+
+
+/*!
+ * Process Ascii validation. Allowed characters are from 32 to 126.
+ * 
+ * @param key to be validated.
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ */
+Wpa2KeyValidator::KeyStatus Wpa2KeyValidator::isAscii(const QString &key)
+{
+    QChar ch32(32);
+    QChar ch126(126);
+
+    const QChar *data = key.data();
+    while (!data->isNull()) {
+        if ((*data) < ch32 || (*data) > ch126) {
+            return KeyStatusIllegalCharacters;
+        }
+        ++data;
+    }
+    return KeyStatusOk;
+}
+
+/*!
+ * Process Hex validation. Allowed characters are
+ * - from 0 to 9
+ * - from a to f
+ * - from A to F
+ * 
+ * @param key to be validated.
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ */
+Wpa2KeyValidator::KeyStatus Wpa2KeyValidator::isHex(const QString &key)
+{
+    QChar ch_A(65); // Character: A
+    QChar ch_F(70); // Character: F
+    QChar ch_a(97); // Character: a
+    QChar ch_f(102);// Character: f
+
+    const QChar *data = key.data();
+    while (!data->isNull()) {
+        if (data->isDigit() ||
+            (*data) >= ch_a && (*data) <= ch_f ||
+            (*data) >= ch_A && (*data) <= ch_F) {
+            ++data;
+        }
+        else {
+            return KeyStatusIllegalCharacters;
+        }
+    }
+    return KeyStatusOk;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/traces/OstTraceDefinitions.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: .
+ *   
+ *
+ */
+ 
+ 
+/*
+ * %version: 3 %
+ */
+
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+#include <opensystemtrace.h>
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/cpwpacmnui.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,53 @@
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+# Contributors:
+# Description:
+# %version: 10 %
+TEMPLATE = lib
+TARGET = cpwpacmnui
+DEPENDPATH += 
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+    $$OS_LAYER_SYSTEMINCLUDE \
+    ../../inc
+    
+CONFIG += hb
+LIBS += -lcpframework \
+    -leapqtplugininfo \
+    -leapqtconfiginterface \
+    -lconnection_settings_shim
+
+# Input
+HEADERS += traces/OstTraceDefinitions.h \
+    inc/cpwpacmnui_global.h \
+    inc/cpwpacmnui.h
+SOURCES += src/cpwpacmnui.cpp
+
+# QMAKE_EXTRA_TARGETS += copyheaders
+# directories
+#The actual path to be replaced later
+DESTDIR = HB_BUILD_DIR/lib
+win32:DLLDESTDIR = HB_BUILD_DIR/bin
+DEFINES += WPAUI_LIBRARY
+
+defFilePath = ..
+
+symbian:
+ { 
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.UID3 = 0x2002DC74
+    BLD_INF_RULES.prj_exports += "./rom/cpwpacmnui.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpacmnui.iby)"
+}
+
+# Temporary solution to fix tracecompiler
+# When tracecompiler is fixed, this can be removed
+symbian: {
+    MMP_RULES += "USERINCLUDE traces"
+}
+
+TARGET.CAPABILITY = CAP_GENERAL_DLL
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/inc/cpwpacmneapui.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Control Panel QT EAP view for WPA/WPA2/802_Dot_1x/WPA2 only configuration
+ *
+ */
+
+/*
+ * %version: 4 %
+ */
+
+#ifndef CPWPACMNEAPUI_H_
+#define CPWPACMNEAPUI_H_
+
+class CpWpaCmnUi;
+#include <cpsettingformentryitemdata.h>
+/*! 
+ * Implements the Ui EAP Plugin Loader for WPA/WPA2/802_Dot_1x/WPA2 only Security Modes  
+ */
+class EapEntyItemData : public CpSettingFormEntryItemData
+{
+public:
+    EapEntyItemData(CpWpaCmnUi* wpa, CpItemDataHelper &itemDataHelper,
+            const QString &text = QString(), const QString &description =
+                    QString(), const HbIcon &icon = HbIcon(),
+            const HbDataFormModelItem *parent = 0);
+
+    virtual ~EapEntyItemData();
+
+    /*!
+     Implement CpSettingFormEntryItemData::createSettingView
+     */
+    virtual CpBaseSettingView *createSettingView() const;
+
+private:
+
+    CpWpaCmnUi* mUi;
+    CpItemDataHelper& itemdatahelper;
+};
+
+#endif /* CPWPACMNEAPUI_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/inc/cpwpacmnui.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Control Panel QT UI for WPA/WPA2/802_Dot_1x configuration
+ *
+ */
+
+/*
+ * %version: 9 %
+ */
+
+#ifndef CPWPACMNUI_H
+#define CPWPACMNUI_H
+
+// System includes
+#include <cpsettingformitemdata.h>
+#include <cpsettingformentryitemdata.h>
+#include <eapqtconfiginterface.h>
+#include <eapqtplugininfo.h>
+#include <cpitemdatahelper.h>
+#include <cpbasesettingview.h>
+
+// User includes
+#include "cpwpacmnui_global.h"
+#include "cpwlansecurityplugininterface.h"
+
+// Forward declarations
+class EapPluginInformation;
+class PluginInformation;
+class CpBaseSettingView;
+class EapQtConfigInterface;
+class EapEntyItemData;
+class CmConnectionMethodShim;
+
+/*! 
+ * Implements the Ui for WPA/WPA2/802.1x Security Mode  
+ */
+
+// Class declaration
+class WPAUI_EXPORT CpWpaCmnUi : public QObject
+{
+    Q_OBJECT
+    
+    
+    public:
+    
+        CpWpaCmnUi(CMManagerShim::WlanSecMode securityMode, CpItemDataHelper &dataHelpper);
+        ~CpWpaCmnUi();
+        CpSettingFormItemData* createUi(
+                EapQtConfigInterface *mEapQtConfigInterface,
+                CmConnectionMethodShim *cmCM);
+        //CpBaseSettingView *eapUiInstance();
+        
+        void reset();
+
+    signals:
+    
+        void keyChanged(QString& key);
+        void pskEapModeToggled(int pskEnable);
+        void eapPluginChanged(int eapPlugin);
+        void connectionStateChanged(int state);
+        
+    
+    private:
+    
+        //void loadWPAPskView();
+        //void loadWPAEapView();
+        //void removePskView();
+        //void removeEapView();
+        void loadUi();
+        void readValues();
+        void loadWPA_WPA2Fields();
+        //void load802Dot1xFields();
+    
+    private slots:
+    
+        //void wpaTypeChanged(int pskEnable);
+        void pskKeyChanged();
+        //void eapTypeChanged(int eapPlugin);
+        //void unencryptConnStateChanged(int state);
+    
+    private:
+        
+        Q_DISABLE_COPY(CpWpaCmnUi)
+        CpSettingFormItemData* mCmnUi;
+        CpItemDataHelper &mDataHelper;
+        CpSettingFormItemData* mPskKeyText;
+        CpSettingFormItemData* mEapPlugins;
+        CpSettingFormItemData* mUnencryptedConnection;
+        CpSettingFormItemData *mWpaEapItem;
+        QString mKeyData;
+        //QList<EapQtPluginInfo> mPlugins;
+        EapEntyItemData* mEapEntry;
+        EapQtConfigInterface *mEapQtConfigInterface;
+        int mPluginCurrent;
+        CMManagerShim::WlanSecMode mSecurityMode;
+        bool mEnablePskMode;
+        int mcurrentEapPlugin;
+        CmConnectionMethodShim* mConnMethod;
+        int unencryptStateChanged;
+};
+
+
+
+#endif//CPWPACMNUI_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/inc/cpwpacmnui_global.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    
+ *
+ */
+
+/*
+ * %version: 5 %
+ */
+#ifndef CPWPACMNUI_GLOBAL_H_
+#define CPWPACMNUI_GLOBAL_H_
+
+
+#include <QtCore/QtGlobal>
+ 
+ #if defined(WPAUI_LIBRARY)
+ #define WPAUI_EXPORT Q_DECL_EXPORT
+ #else
+ #if defined(WPAUI_NO_LIBRARY)
+ #define WPAUI_EXPORT
+ #else
+ #define WPAUI_EXPORT Q_DECL_IMPORT
+ #endif
+ #endif
+
+
+#endif //CPWPACMNUI_GLOBAL_H_
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/rom/cpwpacmnui.iby	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef __CPWPACMNUI_IBY__
+#define __CPWPACMNUI_IBY__
+
+//file content
+file=ABI_DIR\UREL\cpwpacmnui.DLL		SHARED_LIB_DIR\cpwpacmnui.DLL
+
+#endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/src/cpwpacmneapui.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Control Panel QT EAP view for WPA/WPA2/802_Dot_1x/WPA2 only configuration
+ *
+ */
+
+/*
+ * %version: 4 %
+ */
+
+#include "cpwpacmneapui.h"
+#include "cpwpacmnui.h"
+
+#include <HbDataFormModelItem>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpwpacmneapuiTraces.h"
+#endif
+
+EapEntyItemData::EapEntyItemData(CpWpaCmnUi* wpa,
+        CpItemDataHelper &itemDataHelper, const QString &text,
+        const QString &description, const HbIcon &icon,
+        const HbDataFormModelItem *parent) :
+    CpSettingFormEntryItemData(itemDataHelper, text, description, icon,
+            parent),itemdatahelper(itemDataHelper)
+{
+    mUi = wpa;
+
+}
+
+EapEntyItemData::~EapEntyItemData()
+{
+    OstTraceFunctionEntry1(EAPENTRYITEMDATA_EAPENTRYITEMDATA_ENTRY,this); 
+    OstTraceFunctionExit1(EAPENTRYITEMDATA_EAPENTRYITEMDATA_EXIT,this);
+}
+
+/*!
+ Implement CpSettingFormEntryItemData::createSettingView
+ */
+CpBaseSettingView* EapEntyItemData::createSettingView() const
+{
+    OstTraceFunctionEntry1(EAPENTRYITEMDATA_CREATESETTING_VIEW_ENTRY,this); 
+    OstTraceFunctionExit1(EAPENTRYITEMDATA_CREATESETTING_VIEW_EXIT,this);
+
+    return mUi->eapUiInstance();
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/src/cpwpacmnui.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,448 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Control Panel QT UI for WPA/WPA2/802_Dot_1x configuration
+ *
+ */
+
+/*
+ * %version: 17 %
+ */
+
+// System includes
+#include <QStringList>
+#include <eapqtconfiginterface.h>
+#include <cmconnectionmethod_shim.h>
+#include <cmmanagerdefines_shim.h>
+
+// User includes
+#include "cpwpacmnui.h"
+//#include "cpwpacmneapui.h"
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpwpacmnuiTraces.h"
+#endif
+
+/*!
+ \class CpWpaCmnUi
+ \brief CpWpaCmnUi implements the common Ui for WPA/WPA2/802.1x/WPA2 only 
+ Security Settings Control Panel Plugins,
+ which will allow viewing/editing of WPA/WPA2/802.1x/WPA2 Security Settings.
+ */
+//Contructs Common Ui (WPA/WPA2/802.1x/WPA2only) object
+CpWpaCmnUi::CpWpaCmnUi(CMManagerShim::WlanSecMode securityMode, CpItemDataHelper &dataHelpper) :
+    mCmnUi(NULL), mDataHelper(dataHelpper), mPskKeyText(NULL), mEapPlugins(
+            NULL), mWpaEapItem(NULL), mEapEntry(NULL)
+{
+    mSecurityMode = securityMode;
+    mEnablePskMode = true;
+}
+//Deletes objects owned by Common Ui
+CpWpaCmnUi::~CpWpaCmnUi()
+{
+    //delete all dynamically allocated objects
+    OstTraceFunctionEntry1(CPWPACMNUI_CPWPACMNUI_ENTRY,this);
+
+    mCmnUi = NULL;
+    
+    mConnMethod = NULL;
+
+    OstTraceFunctionExit1(CPWPACMNUI_CPWPACMNUI_EXIT,this);
+}
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ * Creates the Ui instance based on the security mode;WPAWPA2/802.1x/WPA2 only 
+ * Owns the Ui instance
+ * 
+ * \param eapQtConfigInterface to list all eap plugins
+ * \param mCmCM Connection MethoD Qt interface
+ * 
+ * \return Ui instance for the security mode set
+ */
+
+CpSettingFormItemData* CpWpaCmnUi::createUi(
+        EapQtConfigInterface *eapQtConfigInterface,
+        CmConnectionMethodShim *cmCM)
+{
+
+    OstTraceFunctionEntry1(CPWPACMNUI_CREATEUI_ENTRY,this);
+    int err;
+
+    mConnMethod = cmCM;
+
+    //Read values From CommsDatbase
+    QT_TRYCATCH_ERROR(err, ( readValues()));
+    if(err !=KErrNone) {
+          OstTrace1( TRACE_ERROR, CPWPACMNUI_CREATEUI, "CPWPACMNUI ReadValues returned %d", err );
+    }
+
+    mCmnUi = new CpSettingFormItemData(HbDataFormModelItem::GroupItem,
+            hbTrId("txt_occ_subhead_security_settings"));
+
+    mEapQtConfigInterface = eapQtConfigInterface;
+    //mPlugins.append(mEapQtConfigInterface->supportedOuterTypes());
+
+    //PSK / EAP ?
+    mWpaEapItem = new CpSettingFormItemData(
+            HbDataFormModelItem::ComboBoxItem, hbTrId(
+                    "txt_occ_setlabel_wpawpa2"),mCmnUi);
+    QStringList wpatype;
+    //wpatype.append(hbTrId("txt_occ_setlabel_wpawpa2_val_eap"));
+    wpatype.append(hbTrId("txt_occ_setlabel_wpawpa2_val_preshared_key"));
+
+    mWpaEapItem->setContentWidgetData("items", wpatype);
+    mWpaEapItem->setContentWidgetData("currentIndex",0/*To use mEnablePskMode when both modes are available*/);
+
+    mDataHelper.addConnection(mWpaEapItem,
+            SIGNAL(currentIndexChanged(int)), this,
+            SLOT(wpaTypeChanged(int)));
+
+    //1.Pre-Shared Key
+    mPskKeyText = new CpSettingFormItemData(
+            HbDataFormModelItem::TextItem, hbTrId(
+                    "txt_occ_setlabel_preshared_key"),mCmnUi);
+
+    mPskKeyText->setContentWidgetData("text", mKeyData);
+    mPskKeyText->setContentWidgetData("echoMode", 2);
+
+    mPskKeyText->setContentWidgetData("smileysEnabled", "false");
+    mDataHelper.addConnection(mPskKeyText, SIGNAL( editingFinished ()),
+            this, SLOT(pskKeyChanged() ));
+
+    //2.EAP
+    /*  mEapPlugins = new CpSettingFormItemData(
+                HbDataFormModelItem::ComboBoxItem, hbTrId(
+                        "txt_occ_setlabel_eap_type"));
+
+        QStringList items;
+        for (int i = 0; i < mPlugins.length(); ++i)
+            {
+            items << mPlugins.at(i)->localizationId();
+            }
+        mPluginCurrent = 0;
+        mEapPlugins->setContentWidgetData("items", items);
+        //Set the last EAP chosen , by reading from CommsDb
+        mDataHelper.addConnection(mEapPlugins,
+                SIGNAL(currentIndexChanged(int)), this,
+                SLOT(eapTypeChanged(int)));
+
+        mEapEntry = new EapEntyItemData(this, mDataHelper, hbTrId(
+                "txt_occ_button_eap_type_settings"), QString(""));*/
+
+    mUnencryptedConnection = new CpSettingFormItemData(
+            HbDataFormModelItem::CheckBoxItem, hbTrId(
+                    "txt_occ_setlabel_unencrypted_connection"),mCmnUi);
+
+    mUnencryptedConnection->setContentWidgetData("text", hbTrId(
+            "txt_occ_setlabel_unencrypted_connection_val_allowe"));
+
+    //Kept Unchecked by default , but to be read from Comms DB
+    mUnencryptedConnection->setContentWidgetData("checkState",
+            "Unchecked");
+
+    mDataHelper.addConnection(mUnencryptedConnection,
+            SIGNAL( stateChanged(int)), this,
+            SLOT(unencryptConnStateChanged(int)));
+
+    //LoadUi based on the security mode 
+    loadUi();
+
+    OstTraceFunctionExit1(CPWPACMNUI_CREATEUI_EXIT,this);
+    return mCmnUi;
+
+}
+
+// ======== LOCAL FUNCTIONS ========
+
+/*! 
+ Load the CpSettingFormItemData components, based on the security 
+ mode chosen. Only those components that are required by that security
+ mode are loaded
+ */
+void CpWpaCmnUi::loadUi()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_LOADUI_ENTRY,this);
+    int secMode = mSecurityMode;
+    switch (secMode)
+        {
+        case CMManagerShim::WlanSecModeWpa:
+        case CMManagerShim::WlanSecModeWpa2:
+            {
+                if (mEnablePskMode) {
+                    mCmnUi->appendChild(mWpaEapItem);
+                    mCmnUi->appendChild(mPskKeyText);
+                }
+                /*else {
+                    //do nothing, no EAP 
+                    mCmnUi->appendChild(mWpaEapItem);
+                    mCmnUi->appendChild(mEapPlugins);
+                    mCmnUi->appendChild(mEapEntry);
+                }*/
+
+            }
+            break;
+
+        /*case CMManagerShim::WlanSecMode802_1x:
+            {
+            mCmnUi->appendChild(mEapPlugins);
+            mCmnUi->appendChild(mEapEntry);
+            mCmnUi->appendChild(mUnencryptedConnection);
+            }
+            break;*/
+        default:
+            break;
+        } 
+    OstTraceFunctionExit1(CPWPACMNUI_LOADUI_EXIT,this);
+}
+
+/*! 
+ Load the CpSettingFormItemData components,for the
+ Pre-Shared key mode
+ */
+/*void CpWpaCmnUi::loadWPAPskView()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_LOADWPAPSKVIEW_ENTRY,this);
+    mCmnUi->appendChild(mPskKeyText);
+    OstTraceFunctionExit1(CPWPACMNUI_LOADWPAPSKVIEW_EXIT,this);
+}*/
+
+/*! 
+ Load the CpSettingFormItemData components,for the
+ EAP  mode
+ */
+/*void CpWpaCmnUi::loadWPAEapView()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_LOADWPAEAPVIEW_ENTRY,this);
+    mCmnUi->appendChild(mEapPlugins);
+    mCmnUi->appendChild(mEapEntry);
+    OstTraceFunctionExit1(CPWPACMNUI_LOADWPAEAPVIEW_EXIT,this);
+}*/
+
+/*! 
+ Load the CpSettingFormItemData components,for the
+ EAP  mode
+ */
+/*CpBaseSettingView* CpWpaCmnUi::eapUiInstance()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_EAPUIINSTANCE_ENTRY,this); 
+    OstTraceFunctionExit1(CPWPACMNUI_EAPUIINSTANCE_EXIT,this);
+
+    return mEapQtConfigInterface->uiInstance(
+            mPlugins.at(mPluginCurrent)->pluginHandle());
+    return NULL;
+}*/
+
+/*!
+ Slot to handle change in wpa mode :- PSK /EAP
+ Emits a mode change signal to the  security plugin 
+ to indicate the change
+
+ \param pskEnable the current mode chosen
+ */
+/*void CpWpaCmnUi::wpaTypeChanged(int pskEnable)
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_WPATYPECHANGED_ENTRY,this);
+    switch (pskEnable)
+        {
+        case 0:
+            {
+            RemovePskView();
+            LoadWPAEapView();
+            }
+            break;
+
+        case 1:
+            {
+            RemoveEapView();
+            LoadWPAPskView();
+            }
+            break;
+        } //do nothing , only PSK mode, no EAP
+    OstTraceFunctionExit1(CPWPACMNUI_WPATYPECHANGED_EXIT,this);
+    //Emit signal back to plugin
+    emit pskEapModeToggled(pskEnable);
+}*/
+
+/*!
+ * Unload components related to Pre-Shared key mode
+ */
+/*void CpWpaCmnUi::removePskView()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_REMOVEPSKVIEW_ENTRY,this);
+    int indexOfPsk = mCmnUi->indexOf(mPskKeyText);
+    mCmnUi->removeChild(indexOfPsk);
+    OstTraceFunctionExit1(CPWPACMNUI_REMOVEPSKVIEW_EXIT,this);
+}*/
+
+/*!
+ * Unload components related to EAP mode
+ */
+/*void CpWpaCmnUi::removeEapView()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_REMOVEEAPVIEW_ENTRY,this);
+    int indexOfEapPlugin = mCmnUi->indexOf(mEapPlugins);
+    mCmnUi->removeChild(indexOfEapPlugin);
+
+    int indexOfEapEntry = mCmnUi->indexOf(mEapEntry);
+    mCmnUi->removeChild(indexOfEapEntry);
+    OstTraceFunctionExit1(CPWPACMNUI_REMOVEEAPVIEW_EXIT,this);
+}*/
+
+/*!
+ Slot to handle change in eap method in use.
+ Emits signal back to the security plugin to indicate 
+ the change
+ \param currentplugin plugin number to indicate the
+ eap method in use
+ */
+/*void CpWpaCmnUi::eapTypeChanged(int eapPlugin)
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_EAPTYPECHANGED_ENTRY,this);
+    mPluginCurrent = eapPlugin;
+    OstTraceFunctionExit1(CPWPACMNUI_EAPTYPECHANGED_EXIT,this);
+    emit eapPluginChanged(mPluginCurrent);
+}*/
+
+/*!
+ Slot to handle change in pre-shared key string
+ Emits signal back to the security plugin to indicate 
+ the change
+
+ */
+void CpWpaCmnUi::pskKeyChanged()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_PSKKEYCHANGED_ENTRY,this);
+    QVariant keyValue = mPskKeyText->contentWidgetData("text");
+    QString keyString = keyValue.toString();
+    OstTraceFunctionExit1(CPWPACMNUI_PSKKEYCHANGED_EXIT,this);
+    //Emit signal back to plugin
+    emit keyChanged(keyString);
+}
+
+/*!
+ Slot to handle change in the state of unencrypted connection;
+ to indicate if such a connection is allowed.
+ Emits signal back to the security plugin to indicate 
+ the change
+ \param state checked-Allowed / Unchecked-Not allowed 
+ */
+/*void CpWpaCmnUi::unencryptConnStateChanged(int state)
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_UNENCRYPTCONNSTATECHANGED_ENTRY,this); emit
+    connectionStateChanged(state);
+    OstTraceFunctionExit1(CPWPACMNUI_UNENCRYPTCONNSTATECHANGED_EXIT,this);
+}*/
+
+/*!
+ * Reads the wlan security fields from CommsDb 
+ */
+void CpWpaCmnUi::readValues()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_READVALUES_ENTRY,this);
+    switch (mSecurityMode)
+        {
+        case CMManagerShim::WlanSecModeWpa:
+        case CMManagerShim::WlanSecModeWpa2:
+            {
+            loadWPA_WPA2Fields();
+            }
+            break;
+
+       /* case CMManagerShim::WlanSecMode802_1x:
+            {
+            load802Dot1xFields();
+            }
+            break;*/
+
+        default:
+            break;
+        } 
+    OstTraceFunctionExit1(CPWPACMNUI_READVALUES_EXIT,this);
+}
+
+/*!
+ * Reads the wlan security wpa/wpa2 related fields from CommsDb 
+ */
+void CpWpaCmnUi::loadWPA_WPA2Fields()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_LOADWPAFIELDS_ENTRY,this);
+    /*mEnablePskMode = mConnMethod->getIntAttribute(
+            CMManagerShim::WlanEnableWpaPsk);*/
+			
+	 //only PSK mode enabled(temporary);to be read from Comms later
+    mEnablePskMode = true ; 		
+    
+    //set the same to Comms(temporary) ; the mode to be set , depends on what user chooses 
+    //between PSK & EAP
+     mConnMethod->setBoolAttribute(CMManagerShim::WlanEnableWpaPsk,mEnablePskMode);
+			
+    if (mEnablePskMode) {
+        mKeyData = mConnMethod->getString8Attribute(
+                CMManagerShim::WlanWpaPreSharedKey);
+    }
+   /* else {
+        //mcurrentEapPlugin = mCMExtShim->GetIntAttribute( use appropriate enum to get the eap plugin index );
+    } */
+    OstTraceFunctionExit1(CPWPACMNUI_LOADWPAFIELDS_EXIT,this);
+}
+
+/*!
+ * Reads the wlan security eap related fields from CommsDb 
+ */
+/*void CpWpaCmnUi::load802Dot1xFields()
+{
+    OstTraceFunctionEntry1(CPWPACMNUI_LOAD802DOT1XFIELDS_ENTRY,this);
+    //mcurrentEapPlugin = mCMExtShim->GetIntAttribute(use appropriate enum to get the eap plugin index);
+
+    //unencryptStateChanged = mConnMethod->getIntAttribute(CMManagerShim::EWlan802_1xAllowUnencrypted);
+    OstTraceFunctionExit1(CPWPACMNUI_LOAD802DOT1XFIELDS_EXIT,this);
+}*/
+
+/*!
+ * Reset the values on the corresponding Ui elements
+ */
+void CpWpaCmnUi::reset()
+    {
+    OstTraceFunctionEntry1(CPWPACMNUI_RESET_ENTRY,this);
+    //Read values from Comms and update the Ui items
+    readValues();
+    
+    switch (mSecurityMode)
+          {
+          case CMManagerShim::WlanSecModeWpa:
+          case CMManagerShim::WlanSecModeWpa2:
+              {
+                  if(mEnablePskMode) {
+                      mPskKeyText->setContentWidgetData("text", mKeyData);
+                  }
+              }
+              break;
+
+          /*case CMManagerShim::WlanSecMode802_1x:
+              {
+              //Set appropriate value in widget for 802.1x
+              if(mEnablePskMode) {
+              mPskKeyText->setContentWidgetData("checkState", mKeyData);
+              }
+              break;*/
+
+          default:
+              break;
+          }
+    OstTraceFunctionExit1(CPWPACMNUI_RESET_EXIT,this);
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/traces/OstTraceDefinitions.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: .
+ *   
+ *
+ */
+ 
+ 
+/*
+ * %version: 2 %
+ */
+
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+#include <opensystemtrace.h>
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/cpwpaui.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,71 @@
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+# Contributors:
+# Description:
+# Control Panel QT UI for WPA configuration
+# %version: tr1cfwln#7 %
+TEMPLATE = lib
+TARGET = cpwpaui
+DEPENDPATH += 
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+    $$OS_LAYER_SYSTEMINCLUDE \
+    ../cpwpacmnui/inc \
+    ../../inc
+    
+CONFIG += hb \
+    plugin
+LIBS += -lcpframework \
+    -leapqtplugininfo \
+    -lcpwpacmnui \
+    -lconnection_settings_shim
+MOC_DIR = _moc
+RCC_DIR = _rcc
+OBJECTS_DIR = _objects
+
+# Input
+HEADERS += inc/wpakeyvalidator.h \
+    traces/OstTraceDefinitions.h \
+    inc/cpwpaui.h
+SOURCES += src/wpakeyvalidator.cpp \
+    src/cpwpaui.cpp
+symbian: { 
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.UID3 = 0x2002C301
+    LIBS += -leapqtconfiginterface
+    BLD_INF_RULES.prj_exports += "rom/cpwpaui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpaui.iby)"
+}
+symbian { 
+    deploy.path = C:
+    qtplugins.path = /resource/qt/plugins/controlpanel/wlansecurity
+    qtplugins.sources += qmakepluginstubs/cpwpaui.qtplugin
+    
+    # This is for new exporting system coming in garden
+    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+}
+
+# temporary not used; waiting for the latest .ts file ; accordingly export will change
+# translation file temporarily read as qt resource
+# TRANSLATIONS += /resource/qtwlan_en_GB.ts
+
+# Temporary solution to fix tracecompiler
+# When tracecompiler is fixed, this can be removed
+symbian: {
+    MMP_RULES += "USERINCLUDE traces"
+}
+
+RESOURCES += resources/resource.qrc
+
+TARGET.CAPABILITY = CAP_GENERAL_DLL
+dynamiclibrary.sources = cpwpacmnui.dll
+dynamiclibrary.path = /sys/bin
+plugin.sources += cpwpaui.dll
+plugin.path = /resource/qt/plugins/controlpanel
+DEPLOYMENT += plugin \
+    dynamiclibrary
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/inc/cpwpaui.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,123 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: .
+*    Control Panel QT UI for WPA/WPA2 configuration
+*
+*/
+
+/*
+* %version: tr1cfwln#11.1.1 %
+*/
+
+
+#ifndef CPWPAUI_H
+#define CPWPAUI_H
+
+// System includes
+#include <cpsettingformitemdata.h>
+#include <hbglobal.h>
+#include <HbMessageBox>
+
+// User includes
+#include "cpwlansecurityplugininterface.h"
+
+// Forward declarations
+class EapPluginInformation;
+class PluginInformation;
+class CpBaseSettingView;
+class EapQtConfigInterface;
+class EapEntyItemData;
+class CpWpaCmnUi;
+class CmConnectionMethodShim;
+class QTranslator;
+
+/*!
+ * @addtogroup group_wlan_security_ui_plugin_wpa/wpa2
+ * @{
+ */
+
+/*! 
+ * Implements WPA/WPA2 plugin for Wlan security control panel  
+ */
+class CpWpaUi : public QObject, public CpWlanSecurityPluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(CpWlanSecurityPluginInterface)
+
+public:
+    CpWpaUi();
+    ~CpWpaUi();
+
+public: // from CpWlanSecurityPluginInterface 
+       
+    CMManagerShim::WlanSecMode securityMode() const;
+    
+    QString securityModeTextId() const;
+        
+    void setReference(CmConnectionMethodShim *cmCm, uint id);
+        
+    int orderNumber() const;
+       
+    CpSettingFormItemData* uiInstance(
+            CpItemDataHelper &dataHelper);
+    
+private:
+    
+    bool tryUpdate();
+
+    void handleUpdateError();
+
+    void showMessageBox( HbMessageBox::MessageBoxType type,
+            const QString &text);
+    
+    void updateWpaSettings();
+    
+  
+private slots:
+ 
+    //void currentEapPlugin(int plugin);    
+    //void wpaTypeChanged(int pskEnable);
+    void pskKeyChanged(QString& key);
+         
+
+private:
+    
+    Q_DISABLE_COPY(CpWpaUi)
+        
+    //!WPA security group item
+    CpSettingFormItemData* mUi;   
+
+    //! Connection method Id
+    int mCmId;
+   
+    //!Translator for all the localisation Text Id's
+    QTranslator *mTranslator;
+    
+    //! Connection Settings Shim connection method pointer    
+    CmConnectionMethodShim *mCmCM;    
+    
+    //! Eap Plugin config interface
+    EapQtConfigInterface *mEapQtConfigInterface;
+    
+    //!WPA ui Implementer Interface
+    QScopedPointer <CpWpaCmnUi> mWpaUi;
+    
+    //! Message box for info notes
+    QSharedPointer<HbMessageBox> mMessageBox;
+    
+ };
+
+/*! @} */
+ 
+#endif //CPWPAUI_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/inc/wpakeyvalidator.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   WLAN Wizard Utilities
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#ifndef WPAKEYVALIDATOR_H
+#define WPAKEYVALIDATOR_H
+
+/*!
+ * @addtogroup group_wpa_key_validator
+ * @{
+ */
+
+class WpaKeyValidator
+{
+public:
+    enum KeyStatus
+    {
+        KeyStatusOk,
+        KeyStatusIllegalCharacters,
+        KeyStatusWpaTooShort,
+        KeyStatusWpaTooLong
+    };
+
+    static const int WpaMaxLenght = 64;
+    static const int WpaMinLenght = 8;
+    
+public:
+
+    static KeyStatus validateWpaKey(const QString &key);
+    static KeyStatus isAscii(const QString &key);
+    static KeyStatus isHex(const QString &key);
+};
+
+/*! @} */
+
+#endif /* WPAKEYVALIDATOR_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/resources/resource.qrc	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/loc" >
+        <file>wlan_en_GB.qm</file>
+    </qresource>
+</RCC>
Binary file securitysettings/cpwlansecurityuiplugins/cpwpaui/resources/wlan_en_GB.qm has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/resources/wlan_en_GB.ts	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,4052 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="3.0" language="en_GB" sourcelanguage="en_GB">
+<context>
+<message numerus="no" id="txt_occ_dblist_destination">
+    <comment>Title for destination summary item</comment>        
+    <source>Destination</source>
+    <translation variants="no">Destination</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_add_apn">
+    <comment></comment>        
+    <source>Add APN</source>
+    <translation variants="no">Add APN</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_phone_ip_address">
+    <comment>Setting label. IP address for the phone.</comment>        
+    <source>Phone IP address</source>
+    <translation variants="no">Phone IP address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_17</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode">
+    <comment>Title for network mode summary item</comment>        
+    <source>Network mode</source>
+    <translation variants="no">Network mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_realm_val_generate_automatically">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_54_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv0">
+    <comment></comment>        
+    <source>PEAPv0</source>
+    <translation variants="no">PEAPv0</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_medium_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Medium (%L1%)</source>
+    <translation variants="no">Medium (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wireless_lan">
+    <comment></comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_titlebar</extra-loc-layout_id>    
+    <extra-loc-viewid>occ</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_forget_network">
+    <comment></comment>        
+    <source>Forget network</source>
+    <translation variants="no">Forget network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_settings_2</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_cipher_suites">
+    <comment></comment>        
+    <source>Cipher suites</source>
+    <translation variants="no">Cipher suites</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsa3dessha">
+    <comment></comment>        
+    <source>RSA,3DES,SHA</source>
+    <translation variants="no">RSA,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhersa3dessha">
+    <comment></comment>        
+    <source>DHE-RSA,3DES,SHA</source>
+    <translation variants="no">DHE-RSA,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_downloads">
+    <comment></comment>        
+    <source>Downloads</source>
+    <translation variants="no">Downloads</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_configuration_failed">
+    <comment></comment>        
+    <source>Configuration failed</source>
+    <translation variants="no">Configuration failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_java_app">
+    <comment></comment>        
+    <source>Java app.</source>
+    <translation variants="no">Java app.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_low_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Low (%L1%)</source>
+    <translation variants="no">Low (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_unencrypted_connection_val_allowe">
+    <comment></comment>        
+    <source>Allowed</source>
+    <translation variants="no">Allowed</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_62_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_128bit_key">
+    <comment></comment>        
+    <source>128-bit key</source>
+    <translation variants="no">128-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_wlan_only">
+    <comment></comment>        
+    <source>WLAN only</source>
+    <translation variants="no">WLAN only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_adhoc">
+    <comment></comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks_val_userdefine">
+    <comment></comment>        
+    <source>User-defined interval</source>
+    <translation variants="no">User-defined interval</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate">
+    <comment></comment>        
+    <source>Authority certificate</source>
+    <translation variants="no">Authority certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_33</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_cellular_cancel">
+    <comment>Cancel connection establishment.</comment>        
+    <source>Cancel</source>
+    <translation variants="no">Cancel</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_adhoc">
+    <comment>Network mode summary item: Ad-hoc</comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_client_certificate">
+    <comment></comment>        
+    <source>WAPI client certificate</source>
+    <translation variants="no">WAPI client certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_37</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_intranet">
+    <comment></comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_3">
+    <comment></comment>        
+    <source>WEP key #3</source>
+    <translation variants="no">WEP key #3</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_authority_certificate">
+    <comment></comment>        
+    <source>Select authority certificate:</source>
+    <translation variants="no">Select authority certificate:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_02</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name_val_vpn">
+    <comment>Setting value. Default name for VPN access point in case no name defined by user.</comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_on_hold">
+    <comment>Value for detail in details view.</comment>        
+    <source>On hold</source>
+    <translation variants="no">On hold</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_delete_snap">
+    <comment>Confirmation dialog. Confirms the deletion of a destination. %1 is the name of the destination, does not need localisation.</comment>        
+    <source>Delete &apos;%1&apos;?</source>
+    <translation variants="no">Delete &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_delete_snap</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_delete_vpn_policy">
+    <comment></comment>        
+    <source>Delete &apos;%1&apos;?</source>
+    <translation variants="no">Delete &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_delete_policy</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status">
+    <comment>Setting label. WLAN network status.</comment>        
+    <source>Network status</source>
+    <translation variants="no">Network status</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_speed">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Speed</source>
+    <translation variants="no">Speed</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_kb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 kB</source>
+    <translation variants="no">%1 kB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_activate_restrictions">
+    <comment></comment>        
+    <source>Activate restrictions</source>
+    <translation variants="no">Activate restrictions</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_connection_details">
+    <comment></comment>        
+    <source>Connection details</source>
+    <translation variants="no">Connection details</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_off">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is off.</comment>        
+    <source>WLAN is off</source>
+    <translation variants="no">WLAN is off</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_arrange">
+    <comment>View specific menu item. Sets the view to Arrange mode where drag-and-drop can be used to re-prioritise access points.</comment>        
+    <source>Arrange</source>
+    <translation variants="no">Arrange</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_realm">
+    <comment></comment>        
+    <source>Realm</source>
+    <translation variants="no">Realm</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_41</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_select_network_mode_and_status">
+    <comment></comment>        
+    <source>Select network mode (and status):</source>
+    <translation variants="no">Select network mode (and status):</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>dialog_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_server_address">
+    <comment>Setting label. Proxy server address (URI or IP address).</comment>        
+    <source>Proxy server address</source>
+    <translation variants="no">Proxy server address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_19</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wpawpa2">
+    <comment>Setting value. WLAN uses WPA/WPA2 security.</comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_select_network_security_mode">
+    <comment></comment>        
+    <source>Select network security mode:</source>
+    <translation variants="no">Select network security mode:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>dialog_7</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_no_certificates_found">
+    <comment></comment>        
+    <source>No certificates found</source>
+    <translation variants="no">No certificates found</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_01</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_internet_val_no_access_points">
+    <comment>List item, 2-row, secondary text. No access points defined in the destination in question.</comment>        
+    <source>No access points</source>
+    <translation variants="no">No access points</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2_3_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_wellknown">
+    <comment>Setting value. DNS addresses are well-known (standard-defined fixed addresses).</comment>        
+    <source>Well-known</source>
+    <translation variants="no">Well-known</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_infrastructure_public">
+    <comment></comment>        
+    <source>Public</source>
+    <translation variants="no">Public</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_show_unknown_networks">
+    <comment></comment>        
+    <source>Show unknown networks</source>
+    <translation variants="no">Show unknown networks</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_next">
+    <comment>Next toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Next</source>
+    <translation variants="no">Next</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_use">
+    <comment></comment>        
+    <source>WEP key in use</source>
+    <translation variants="no">WEP key in use</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_connection">
+    <comment></comment>        
+    <source>Select connection:</source>
+    <translation variants="no">Select connection:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_secondary_name_server">
+    <comment>Setting label. Secondary domain name server&apos;s (DNS) address.</comment>        
+    <source>Secondary name server</source>
+    <translation variants="no">Secondary name server</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_24</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving">
+    <comment></comment>        
+    <source>Power saving</source>
+    <translation variants="no">Power saving</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_connected_to_1">
+    <comment>Custom layout ID parent. Status of WLAN in WLAN list view. WLAN is on, and connected to access point name &apos;%1&apos;.</comment>        
+    <source>Connected to &apos;%1&apos;</source>
+    <translation variants="no">Connected to &apos;%1&apos;</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_notifications">
+    <comment></comment>        
+    <source>Notifications</source>
+    <translation variants="no">Notifications</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_42</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_total">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Total</source>
+    <translation variants="no">Total</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_duration">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Duration</source>
+    <translation variants="no">Duration</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_there_is_a_mismatch_between_the_selec">
+    <comment></comment>        
+    <source>There is a mismatch between the selected certificate and the certificate sent by server. Please verify certificate settings.</source>
+    <translation variants="no">There is a mismatch between the selected certificate and the certificate sent by server. Please verify certificate settings.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_eap_identity_for_1">
+    <comment></comment>        
+    <source>EAP identity for &apos;%1&apos;:</source>
+    <translation variants="no">EAP identity for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapsim_settings">
+    <comment></comment>        
+    <source>EAP-SIM settings</source>
+    <translation variants="no">EAP-SIM settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapfast_settings">
+    <comment></comment>        
+    <source>EAP-FAST settings</source>
+    <translation variants="no">EAP-FAST settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_subnet_mask">
+    <comment>Setting label.Subnet mask is used to define the IP address prefix common to all the devices in the subnet.</comment>        
+    <source>Subnet mask</source>
+    <translation variants="no">Subnet mask</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_21</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_unauthenticated_provisioning">
+    <comment></comment>        
+    <source>Unauthenticated provisioning</source>
+    <translation variants="no">Unauthenticated provisioning</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name">
+    <comment></comment>        
+    <source>User name</source>
+    <translation variants="no">User name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_40</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_destination_val_internet">
+    <comment>TODO: to be removed</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_port_number">
+    <comment>Setting label. Proxy server port number</comment>        
+    <source>Proxy port number</source>
+    <translation variants="no">Proxy port number</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_20</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapttls_settings">
+    <comment></comment>        
+    <source>EAP-TTLS settings</source>
+    <translation variants="no">EAP-TTLS settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wep">
+    <comment>Security mode summary item: WEP</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wpawpa2psk">
+    <comment>Security mode summary item: WPA with password</comment>        
+    <source>WPA with password</source>
+    <translation variants="no">WPA with password</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_known_wlan_networks">
+    <comment></comment>        
+    <source>Known WLAN networks</source>
+    <translation variants="no">Known WLAN networks</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_user_name">
+    <comment></comment>        
+    <source>User name:</source>
+    <translation variants="no">User name:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_53</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_wlan_is_on">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is on, but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapaka_settings">
+    <comment></comment>        
+    <source>EAP-AKA settings</source>
+    <translation variants="no">EAP-AKA settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_not_connected">
+    <comment>Indicator menu WLAN plugin value, WLAN on but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name">
+    <comment>Setting label. User-defined name for internet access point.</comment>        
+    <source>Connection name</source>
+    <translation variants="no">Connection name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_disconnecting">
+    <comment>Status of WLAN in WLAN list view. WLAN connection is being disconnected.</comment>        
+    <source>Disconnecting</source>
+    <translation variants="no">Disconnecting</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_homepage">
+    <comment>Setting label. Homepage for the internet access point.</comment>        
+    <source>Homepage</source>
+    <translation variants="no">Homepage</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_4">
+    <comment></comment>        
+    <source>#4</source>
+    <translation variants="no">#4</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_status_verified">
+    <comment></comment>        
+    <source>Status: verified</source>
+    <translation variants="no">Status: verified</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_check_connection_settings">
+    <comment></comment>        
+    <source>Check connection settings</source>
+    <translation variants="no">Check connection settings</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_switch_wlan_on">
+    <comment></comment>        
+    <source>Switch WLAN on</source>
+    <translation variants="no">Switch WLAN on</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wlan_settings">
+    <comment></comment>        
+    <source>WLAN settings</source>
+    <translation variants="no">WLAN settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode">
+    <comment>Setting label. WLAN network&apos;s security mode.</comment>        
+    <source>WLAN security mode</source>
+    <translation variants="no">WLAN security mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsarc4md5">
+    <comment></comment>        
+    <source>RSA,RC4,MD5</source>
+    <translation variants="no">RSA,RC4,MD5</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_good_l1">
+    <comment>Value for detail in details view.</comment>        
+    <source>Good (%L1%)</source>
+    <translation variants="no">Good (%L1%)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv1">
+    <comment></comment>        
+    <source>PEAPv1</source>
+    <translation variants="no">PEAPv1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_infrastructure_hidden">
+    <comment></comment>        
+    <source>Hidden</source>
+    <translation variants="no">Hidden</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_destinations_access_points">
+    <comment>Groupbox title. Destinations and access point settings.</comment>        
+    <source>Destinations &amp; access points</source>
+    <translation variants="no">Destinations &amp; access points</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_bearer">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Bearer</source>
+    <translation variants="no">Bearer</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wlan_setup_wizard_step_l1">
+    <comment>Heading for WLAN wizard</comment>        
+    <source>WLAN setup wizard, step %L1</source>
+    <translation variants="no">WLAN setup wizard, step %L1</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_details">
+    <comment>Item specific menu item. Opens a view where user can see the details for a WLAN network.</comment>        
+    <source>Details</source>
+    <translation variants="no">Details</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_reset_pac_store">
+    <comment></comment>        
+    <source>Reset PAC store</source>
+    <translation variants="no">Reset PAC store</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhersaaessha">
+    <comment></comment>        
+    <source>DHE-RSA,AES,SHA</source>
+    <translation variants="no">DHE-RSA,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy">
+    <comment></comment>        
+    <source>TLS privacy</source>
+    <translation variants="no">TLS privacy</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status_val_public">
+    <comment>Setting value. WLAN network is public (not hidden).</comment>        
+    <source>Public</source>
+    <translation variants="no">Public</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_gb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 GB</source>
+    <translation variants="no">%1 GB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_known_ne">
+    <comment></comment>        
+    <source>Known &amp; new</source>
+    <translation variants="no">Known &amp; new</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_confirm">
+    <comment></comment>        
+    <source>Confirm</source>
+    <translation variants="no">Confirm</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn_val_always">
+    <comment></comment>        
+    <source>Always</source>
+    <translation variants="no">Always</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_incomplete_details_return_without_sa">
+    <comment></comment>        
+    <source>Incomplete details. Return without saving?</source>
+    <translation variants="no">Incomplete details. Return without saving?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_02</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_adhoc_1">
+    <comment></comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_2</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_dedicated_access_point">
+    <comment></comment>        
+    <source>Dedicated access point</source>
+    <translation variants="no">Dedicated access point</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version_val_peapv0_or_peapv1">
+    <comment></comment>        
+    <source>PEAPv0 or PEAPv1</source>
+    <translation variants="no">PEAPv0 or PEAPv1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_via_1">
+    <comment></comment>        
+    <source>Via &apos;%1&apos;</source>
+    <translation variants="no">Via &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connecting</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_downloading_vpn_policy">
+    <comment></comment>        
+    <source>Downloading VPN policy</source>
+    <translation variants="no">Downloading VPN policy</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_policy_dl</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_2">
+    <comment></comment>        
+    <source>WEP key #2</source>
+    <translation variants="no">WEP key #2</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_realm">
+    <comment></comment>        
+    <source>Realm:</source>
+    <translation variants="no">Realm:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_54</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy_val_on">
+    <comment></comment>        
+    <source>On</source>
+    <translation variants="no">On</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format">
+    <comment></comment>        
+    <source>WEP key format</source>
+    <translation variants="no">WEP key format</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_pac_store">
+    <comment></comment>        
+    <source>PAC store</source>
+    <translation variants="no">PAC store</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access_val_enab">
+    <comment></comment>        
+    <source>Enabled</source>
+    <translation variants="no">Enabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_val_stay_in_fir">
+    <comment>Setting value. Device stays connected to the access point initially selected.</comment>        
+    <source>Stay in first</source>
+    <translation variants="no">Stay in first</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_download_failed">
+    <comment></comment>        
+    <source>Download failed</source>
+    <translation variants="no">Download failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_error_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_tls_privacy_val_off">
+    <comment></comment>        
+    <source>Off</source>
+    <translation variants="no">Off</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_46_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_outer_eap">
+    <comment></comment>        
+    <source>Outer EAP</source>
+    <translation variants="no">Outer EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpa_with_eap">
+    <comment></comment>        
+    <source>WPA with EAP</source>
+    <translation variants="no">WPA with EAP</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_received">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Received</source>
+    <translation variants="no">Received</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_certificate_val_not_in_use">
+    <comment></comment>        
+    <source>(not in use)</source>
+    <translation variants="no">(not in use)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_45_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_reject">
+    <comment></comment>        
+    <source>Reject</source>
+    <translation variants="no">Reject</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_operator_services">
+    <comment></comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_operator_services">
+    <comment>List item, 2-row, primary text. Name of the Operator services destination.</comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode">
+    <comment>Title for security mode summary item.</comment>        
+    <source>Security mode</source>
+    <translation variants="no">Security mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_mschapv2_settings">
+    <comment></comment>        
+    <source>MSCHAPv2 settings</source>
+    <translation variants="no">MSCHAPv2 settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn_val_when_needed">
+    <comment></comment>        
+    <source>When needed</source>
+    <translation variants="no">When needed</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_confirm_password">
+    <comment></comment>        
+    <source>Confirm password:</source>
+    <translation variants="no">Confirm password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_07</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_58</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data">
+    <comment></comment>        
+    <source>Cellular data</source>
+    <translation variants="no">Cellular data</translation>
+    <extra-loc-layout_id>qtl_indimenu_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dedicated_access_point">
+    <comment></comment>        
+    <source>Dedicated access point</source>
+    <translation variants="no">Dedicated access point</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_selection">
+    <comment>Setting label. Defines whether the device automatically roams to best signal strength WLAN access point between WLAN access points (base stations) having the same WLAN network name (SSID), or if it stays connected to the access point it initially selected.</comment>        
+    <source>WLAN base station selection</source>
+    <translation variants="no">WLAN base station selection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_inner_eap_type">
+    <comment></comment>        
+    <source>Configure inner EAP type</source>
+    <translation variants="no">Configure inner EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_1_connected">
+    <comment>Indicator menu WLAN plugin value, WLAN connected to access point %1 (parameter not localised).</comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_ip_address">
+    <comment>Heading for detail in details view.</comment>        
+    <source>IP address</source>
+    <translation variants="no">IP address</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_enter_access_pt_name_or_leave_blan">
+    <comment></comment>        
+    <source>Enter access pt. name or leave blank and press &apos;OK&apos; to add operator default:</source>
+    <translation variants="no">Enter access pt. name or leave blank and press &apos;OK&apos; to add operator default:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_acl_add_apn</extra-loc-viewid>
+    <extra-loc-positionid>dialog_3</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode_val_unauthentic">
+    <comment></comment>        
+    <source>Unauthenticated</source>
+    <translation variants="no">Unauthenticated</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_network_status_val_hidden">
+    <comment>Setting value. WLAN network is hidden.</comment>        
+    <source>Hidden</source>
+    <translation variants="no">Hidden</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_13_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_tx_power">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Tx power</source>
+    <translation variants="no">Tx power</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_home_network">
+    <comment></comment>        
+    <source>Data usage in home network</source>
+    <translation variants="no">Data usage in home network</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_apn">
+    <comment>Heading for detail in details view.</comment>        
+    <source>APN</source>
+    <translation variants="no">APN</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_256bit_key">
+    <comment></comment>        
+    <source>256-bit key</source>
+    <translation variants="no">256-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_default_gateway">
+    <comment>Setting label. Default gateway defines the IP address of the router in a network using subnets.</comment>        
+    <source>Default gateway</source>
+    <translation variants="no">Default gateway</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_22</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpa_with_password">
+    <comment></comment>        
+    <source>WPA with password</source>
+    <translation variants="no">WPA with password</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_wlan_to_be_used_instead_of_ce">
+    <comment></comment>        
+    <source>Select WLAN to be used instead of cellular data.</source>
+    <translation variants="no">Select WLAN to be used instead of cellular data.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_settings_received_for_multiple_ne">
+    <comment></comment>        
+    <source>Settings received for multiple networks</source>
+    <translation variants="no">Settings received for multiple networks</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_access_point">
+    <comment></comment>        
+    <source>Access point</source>
+    <translation variants="no">Access point</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_9</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_signal_too_weak">
+    <comment></comment>        
+    <source>Signal too weak </source>
+    <translation variants="no">Signal too weak </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_issuer_1">
+    <comment></comment>        
+    <source>Issuer: &apos;%1&apos;</source>
+    <translation variants="no">Issuer: &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_certificate">
+    <comment></comment>        
+    <source>Certificate</source>
+    <translation variants="no">Certificate</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode_val_authenticat">
+    <comment></comment>        
+    <source>Authenticated</source>
+    <translation variants="no">Authenticated</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eaptls_settings">
+    <comment></comment>        
+    <source>EAP-TLS settings</source>
+    <translation variants="no">EAP-TLS settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_ssid">
+    <comment>Heading for detail in details view.</comment>        
+    <source>SSID</source>
+    <translation variants="no">SSID</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_name">
+    <comment>Custom layout ID parent. Title for network name summary item</comment>        
+    <source>Network name</source>
+    <translation variants="no">Network name</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_9</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_settings">
+    <comment></comment>        
+    <source>Network settings</source>
+    <translation variants="no">Network settings</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_19</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_mb">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 MB</source>
+    <translation variants="no">%1 MB</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password">
+    <comment></comment>        
+    <source>PAC store password</source>
+    <translation variants="no">PAC store password</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_secondary_dns">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Secondary DNS</source>
+    <translation variants="no">Secondary DNS</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_network_connection">
+    <comment></comment>        
+    <source>Network connection</source>
+    <translation variants="no">Network connection</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_primary_name_server_val_automatic">
+    <comment>Setting value. Primary DNS address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_23_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_connect_this_time">
+    <comment>Allow connection this time. Will prompt again next time.</comment>        
+    <source>Connect this time</source>
+    <translation variants="no">Connect this time</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_val_generate_automatic">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_53_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_manual">
+    <comment></comment>        
+    <source>Manual</source>
+    <translation variants="no">Manual</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_packet_data">
+    <comment>Value for detail in details view.</comment>        
+    <source>Packet data</source>
+    <translation variants="no">Packet data</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_previous">
+    <comment>Previous toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Previous</source>
+    <translation variants="no">Previous</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_eapfast">
+    <comment></comment>        
+    <source>EAP-FAST provisioning mode</source>
+    <translation variants="no">EAP-FAST provisioning mode</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_in_val_wlan_only">
+    <comment></comment>        
+    <source>WLAN only</source>
+    <translation variants="no">WLAN only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password_val_prompt">
+    <comment></comment>        
+    <source>Prompt</source>
+    <translation variants="no">Prompt</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_infrastructure_hi">
+    <comment></comment>        
+    <source>Infrastructure (hidden)</source>
+    <translation variants="no">Infrastructure (hidden)</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_notifications_val_show">
+    <comment></comment>        
+    <source>Show</source>
+    <translation variants="no">Show</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_42_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_show_all">
+    <comment></comment>        
+    <source>Show all...</source>
+    <translation variants="no">Show all...</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_network_settings">
+    <comment>Item specific menu item. Opens the access point settings view for the WLAN network.</comment>        
+    <source>Network settings</source>
+    <translation variants="no">Network settings</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan_val_connected_to_1">
+    <comment>List item, 2-row, secondary text. Status of WLAN: WLAN is connected to access point name &apos;%1&apos;.</comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access_val_disa">
+    <comment></comment>        
+    <source>Disabled</source>
+    <translation variants="no">Disabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format_val_hexadecimal">
+    <comment></comment>        
+    <source>Hexadecimal</source>
+    <translation variants="no">Hexadecimal</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_operator_services">
+    <comment></comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_innear_eap_type_for_1">
+    <comment></comment>        
+    <source>Select innear EAP type for &apos;%1&apos;:</source>
+    <translation variants="no">Select innear EAP type for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_04</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_1">
+    <comment></comment>        
+    <source>#1</source>
+    <translation variants="no">#1</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses">
+    <comment>Setting label. Domain name servers&apos; (DNS) IP addresses.</comment>        
+    <source>DNS addresses</source>
+    <translation variants="no">DNS addresses</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_please_try_again">
+    <comment></comment>        
+    <source>Please try again </source>
+    <translation variants="no">Please try again </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_wireless_lan">
+    <comment>List item, 2-row, primary text. Name of the WLAN plug-in under Control Panel&apos;s &quot;Connectivity&quot; group.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_in_CP</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapgtc_settings">
+    <comment></comment>        
+    <source>EAP-GTC settings</source>
+    <translation variants="no">EAP-GTC settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="yes" id="txt_occ_list_lnd_2">
+    <comment>Value for detail in details view.</comment>        
+    <source>%Lnd %2</source>
+    <translation>
+        <numerusform variants="no">(s)%Lnd %2</numerusform>
+        <numerusform variants="no">(p)%Lnd %2</numerusform>
+    </translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_8021x">
+    <comment>Setting value. WLAN uses 802.1X security.</comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_connection_unavailable">
+    <comment></comment>        
+    <source>Connection unavailable</source>
+    <translation variants="no">Connection unavailable</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_wlan_network_not_found">
+    <comment></comment>        
+    <source>WLAN network not found</source>
+    <translation variants="no">WLAN network not found</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_8021x_1">
+    <comment></comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_status_not_verified">
+    <comment></comment>        
+    <source>Status: not verified</source>
+    <translation variants="no">Status: not verified</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_download">
+    <comment></comment>        
+    <source>Download</source>
+    <translation variants="no">Download</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_unknown">
+    <comment></comment>        
+    <source>(unknown)</source>
+    <translation variants="no">(unknown)</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wpawpa2">
+    <comment>Value for detail in details view.</comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_preshared_key_format">
+    <comment></comment>        
+    <source>Pre-shared key format</source>
+    <translation variants="no">Pre-shared key format</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_connecting">
+    <comment></comment>        
+    <source>Connecting</source>
+    <translation variants="no">Connecting</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connecting</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_realm_val_generate_automatically">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_41_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_open">
+    <comment>Setting value. WLAN network is open, no security.</comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_eap_type_settings">
+    <comment></comment>        
+    <source>EAP type settings</source>
+    <translation variants="no">EAP type settings</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_access_point_settings">
+    <comment>Groupbox title. Internet access point settings group.</comment>        
+    <source>Access point settings</source>
+    <translation variants="no">Access point settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_connection_name_val_connection">
+    <comment>Setting value. Default name for internet access point in case no name defined by user.</comment>        
+    <source>Connection</source>
+    <translation variants="no">Connection</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_connection_already_active">
+    <comment></comment>        
+    <source>Connection already active</source>
+    <translation variants="no">Connection already active</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_roaming">
+    <comment></comment>        
+    <source>Data usage when roaming</source>
+    <translation variants="no">Data usage when roaming</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_peap_version">
+    <comment></comment>        
+    <source>PEAP version</source>
+    <translation variants="no">PEAP version</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_51</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_dont_show_again">
+    <comment></comment>        
+    <source>Don&apos;t show again</source>
+    <translation variants="no">Don&apos;t show again</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_creating_connection">
+    <comment>Value for detail in details view.</comment>        
+    <source>Creating connection</source>
+    <translation variants="no">Creating connection</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode_val_infrastruct">
+    <comment>Setting value. WLAN network is based on WLAN base station, i.e. infrastructure.</comment>        
+    <source>Infrastructure</source>
+    <translation variants="no">Infrastructure</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_deactivate_restrictions">
+    <comment></comment>        
+    <source>Deactivate restrictions</source>
+    <translation variants="no">Deactivate restrictions</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_operator_services">
+    <comment>Simple label (groupbox). Name of the Operator services destination.</comment>        
+    <source>Operator services</source>
+    <translation variants="no">Operator services</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_accept">
+    <comment></comment>        
+    <source>Accept</source>
+    <translation variants="no">Accept</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_02</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2_val_eap">
+    <comment></comment>        
+    <source>EAP</source>
+    <translation variants="no">EAP</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_network">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Network</source>
+    <translation variants="no">Network</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_default_gateway_val_not_defined">
+    <comment>Setting value. Default gateway not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_22_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_activate_wlan_in_airplane_mode">
+    <comment></comment>        
+    <source>Activate WLAN in airplane mode?</source>
+    <translation variants="no">Activate WLAN in airplane mode?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_offline_mode_query</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2_val_preshared_key">
+    <comment></comment>        
+    <source>Pre-shared key</source>
+    <translation variants="no">Pre-shared key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption_val_64bit_key">
+    <comment></comment>        
+    <source>64-bit key</source>
+    <translation variants="no">64-bit key</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_eap_type">
+    <comment></comment>        
+    <source>Select EAP type:</source>
+    <translation variants="no">Select EAP type:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_01</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_service_not_available">
+    <comment></comment>        
+    <source>Service not available</source>
+    <translation variants="no">Service not available</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_vpn_error_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_type">
+    <comment></comment>        
+    <source>EAP type</source>
+    <translation variants="no">EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_35</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_use_only_known_networks">
+    <comment></comment>        
+    <source>Use only known networks</source>
+    <translation variants="no">Use only known networks</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_proxy_settings">
+    <comment>Groupbox title. Proxy server settings group.</comment>        
+    <source>Proxy settings</source>
+    <translation variants="no">Proxy settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_closing_connection">
+    <comment>Value for detail in details view.</comment>        
+    <source>Closing connection</source>
+    <translation variants="no">Closing connection</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type">
+    <comment></comment>        
+    <source>Authentication type</source>
+    <translation variants="no">Authentication type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_destination_name">
+    <comment>Input dialog. Name for a new destination.</comment>        
+    <source>Destination name:</source>
+    <translation variants="no">Destination name:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_snap</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_l1_b">
+    <comment>Value for detail in details view.</comment>        
+    <source>%L1 B</source>
+    <translation variants="no">%L1 B</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_connect_automatically">
+    <comment>Allow connecting automatically now and later (will change the appropriate setting under Control Panel).</comment>        
+    <source>Connect automatically</source>
+    <translation variants="no">Connect automatically</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_root_cert_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_38_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_permission_denied">
+    <comment></comment>        
+    <source>Permission denied </source>
+    <translation variants="no">Permission denied </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_service_unreachable">
+    <comment></comment>        
+    <source>Service unreachable</source>
+    <translation variants="no">Service unreachable</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wep_1">
+    <comment></comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection_val_automa">
+    <comment></comment>        
+    <source>Automatically</source>
+    <translation variants="no">Automatically</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsaaessha">
+    <comment></comment>        
+    <source>RSA,AES,SHA</source>
+    <translation variants="no">RSA,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapleap_settings">
+    <comment></comment>        
+    <source>EAP-LEAP settings</source>
+    <translation variants="no">EAP-LEAP settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection_val_when_n">
+    <comment></comment>        
+    <source>When needed</source>
+    <translation variants="no">When needed</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_rsarc4sha">
+    <comment></comment>        
+    <source>RSA,RC4,SHA</source>
+    <translation variants="no">RSA,RC4,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_connect_to_internet_using_cellular_d">
+    <comment>Confirmation dialog text. A cellular data connection is tried to be established (in home network). This may generate costs. User can accept the connection to be established automatically (will change appropriate setting value in Control Panel), only this time (will prompt again next time) or cancel the connection.</comment>        
+    <source>Connect to Internet using cellular data? Data costs may apply.</source>
+    <translation variants="no">Connect to Internet using cellular data? Data costs may apply.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular_home</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data_val_1_connected">
+    <comment></comment>        
+    <source>&apos;%1&apos; connected</source>
+    <translation variants="no">&apos;%1&apos; connected</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_there_are_no_certificates_installed">
+    <comment></comment>        
+    <source>There are no certificates installed. Wizard cannot continue with selected EAP type. Contact your administrator for assistance.</source>
+    <translation variants="no">There are no certificates installed. Wizard cannot continue with selected EAP type. Contact your administrator for assistance.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_packet_data_connection">
+    <comment></comment>        
+    <source>Packet data connection</source>
+    <translation variants="no">Packet data connection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_messaging">
+    <comment></comment>        
+    <source>Messaging</source>
+    <translation variants="no">Messaging</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_network_mode_val_infrastructure_pu">
+    <comment>Network mode summary item: Infrastructure (public)</comment>        
+    <source>Infrastructure (public)</source>
+    <translation variants="no">Infrastructure (public)</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_security">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Security</source>
+    <translation variants="no">Security</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_confirm">
+    <comment></comment>        
+    <source>Confirm</source>
+    <translation variants="no">Confirm</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_cellular_data_usage">
+    <comment></comment>        
+    <source>Cellular data usage</source>
+    <translation variants="no">Cellular data usage</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_configure_manually">
+    <comment></comment>        
+    <source>Configure manually</source>
+    <translation variants="no">Configure manually</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_gateway">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Gateway</source>
+    <translation variants="no">Gateway</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_wep_key">
+    <comment></comment>        
+    <source>Invalid WEP key</source>
+    <translation variants="no">Invalid WEP key</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_wlan_setup_wizard_summary">
+    <comment>Heading for WLAN wizard, summary page</comment>        
+    <source>WLAN setup wizard, summary</source>
+    <translation variants="no">WLAN setup wizard, summary</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_primary_name_server">
+    <comment>Setting label. Primary domain name server&apos;s (DNS) address.</comment>        
+    <source>Primary name server</source>
+    <translation variants="no">Primary name server</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_23</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_highspeed_packet_access">
+    <comment></comment>        
+    <source>High-speed packet access</source>
+    <translation variants="no">High-speed packet access</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_10</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_1_kbs">
+    <comment>Value for detail in details view.</comment>        
+    <source>%1 kB/s</source>
+    <translation variants="no">%1 kB/s</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_pac_store_password">
+    <comment></comment>        
+    <source>PAC store password:</source>
+    <translation variants="no">PAC store password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_08</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_59</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_homepage_val_none">
+    <comment>Setting value. Homepage has not been defined.</comment>        
+    <source>None</source>
+    <translation variants="no">None</translation>
+    <extra-loc-layout_id>qtl_dataform_editor_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_16_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_packet_data">
+    <comment></comment>        
+    <source>Packet data</source>
+    <translation variants="no">Packet data</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks">
+    <comment></comment>        
+    <source>Join WLAN networks</source>
+    <translation variants="no">Join WLAN networks</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_delete_apn">
+    <comment></comment>        
+    <source>Delete APN</source>
+    <translation variants="no">Delete APN</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_internet">
+    <comment></comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_conn_sett_ui_1</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_known_wlan_networks">
+    <comment></comment>        
+    <source>Known WLAN networks</source>
+    <translation variants="no">Known WLAN networks</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_settings_2</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_root_certificate">
+    <comment></comment>        
+    <source>WAPI root certificate</source>
+    <translation variants="no">WAPI root certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_38</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_authentication">
+    <comment></comment>        
+    <source>WAPI authentication</source>
+    <translation variants="no">WAPI authentication</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_indi_menu_wireless_lan">
+    <comment>Indicator menu WLAN plugin title.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_indimenu_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_13</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_input">
+    <comment></comment>        
+    <source>Invalid input</source>
+    <translation variants="no">Invalid input</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_server_name_val_verify">
+    <comment></comment>        
+    <source>Verify</source>
+    <translation variants="no">Verify</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_50_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_format_val_ascii">
+    <comment></comment>        
+    <source>ASCII</source>
+    <translation variants="no">ASCII</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_30_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate_val_not_in">
+    <comment></comment>        
+    <source>(not in use)</source>
+    <translation variants="no">(not in use)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_data_usage_when_val_automatic">
+    <comment></comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_insert_the_name_of_the_new_wlan_net">
+    <comment></comment>        
+    <source>Insert the name of the new WLAN network:</source>
+    <translation variants="no">Insert the name of the new WLAN network:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_1</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type_val_open">
+    <comment></comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_vpn_policy_download">
+    <comment></comment>        
+    <source>VPN policy download</source>
+    <translation variants="no">VPN policy download</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_vpn">
+    <comment></comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_6</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_with_the_access_point_control_servic">
+    <comment></comment>        
+    <source>With the access point control service, packet data connections from your device may be restricted to certain access points only.</source>
+    <translation variants="no">With the access point control service, packet data connections from your device may be restricted to certain access points only.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_user_certificate">
+    <comment></comment>        
+    <source>Select user certificate:</source>
+    <translation variants="no">Select user certificate:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_06</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_8021x">
+    <comment></comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_password">
+    <comment></comment>        
+    <source>Password</source>
+    <translation variants="no">Password</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_43</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving_val_enabled">
+    <comment></comment>        
+    <source>Enabled</source>
+    <translation variants="no">Enabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_internet">
+    <comment>List item, 2-row, primary text. Name of the Internet destination.</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_authenticated_provisioning">
+    <comment></comment>        
+    <source>Authenticated provisioning</source>
+    <translation variants="no">Authenticated provisioning</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_connect_to_internet_in_this_country">
+    <comment>Confirmation dialog text. A cellular data connection is tried to be established outside of home network (i.e. when roaming). This may considerably increase data costs. User can accept the connection this time or reject it. User must go to Control Panel&apos;s connection settings and adjust setting related to data usage abroadto allow automatic connections without confirmations.</comment>        
+    <source>Connect to Internet using cellular data? Phone is outside of home network, and data costs may increase considerably. To allow connecting automatically, adjust the Connection settings.</source>
+    <translation variants="no">Connect to Internet using cellular data? Phone is outside of home network, and data costs may increase considerably. To allow connecting automatically, adjust the Connection settings.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_cellular_abroad</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_automatic">
+    <comment>Setting value. DNS addresses are fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_disable_network">
+    <comment>Item specific menu item. Disables the selected network (i.e. network is not used in automatic connection selection).</comment>        
+    <source>Disable network</source>
+    <translation variants="no">Disable network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_server_1">
+    <comment></comment>        
+    <source>Server: &apos;%1&apos;</source>
+    <translation variants="no">Server: &apos;%1&apos;</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_hide_unknown_networks">
+    <comment></comment>        
+    <source>Hide unknown networks</source>
+    <translation variants="no">Hide unknown networks</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_security_settings">
+    <comment></comment>        
+    <source>Security settings</source>
+    <translation variants="no">Security settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_server_name">
+    <comment></comment>        
+    <source>Server name</source>
+    <translation variants="no">Server name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_50</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_internet">
+    <comment></comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_5</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_open">
+    <comment>Custom layout ID parent. Security mode summary item: Open</comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_selected_network_supports_wifi_prote">
+    <comment></comment>        
+    <source>Selected network supports Wi-Fi Protected Setupâ„¢ for receiving settings automatically. First, press button on wireless station to initiate the setup process, then select &apos;Continue&apos;.</source>
+    <translation variants="no">Selected network supports Wi-Fi Protected Setupâ„¢ for receiving settings automatically. First, press button on wireless station to initiate the setup process, then select &apos;Continue&apos;.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_ascii">
+    <comment></comment>        
+    <source>ASCII</source>
+    <translation variants="no">ASCII</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_subnet_mask_val_not_defined">
+    <comment>Setting value. Subnet mask not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_21_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_certificate">
+    <comment></comment>        
+    <source>Certificate</source>
+    <translation variants="no">Certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_36_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_add_destination">
+    <comment>Action button. Adds a new destination.</comment>        
+    <source>Add destination</source>
+    <translation variants="no">Add destination</translation>
+    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_sim_card_missing">
+    <comment></comment>        
+    <source>SIM card missing </source>
+    <translation variants="no">SIM card missing </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_2">
+    <comment></comment>        
+    <source>#2</source>
+    <translation variants="no">#2</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_unencrypted_connection">
+    <comment></comment>        
+    <source>Unencrypted connection</source>
+    <translation variants="no">Unencrypted connection</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_06</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_62</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_policy_server_address">
+    <comment></comment>        
+    <source>Policy server address</source>
+    <translation variants="no">Policy server address</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_61</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode_val_adhoc">
+    <comment>Setting value. WLAN network is formed between two devices without a base station.</comment>        
+    <source>Ad-hoc</source>
+    <translation variants="no">Ad-hoc</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhedssaessha">
+    <comment></comment>        
+    <source>DHE-DSS,AES,SHA</source>
+    <translation variants="no">DHE-DSS,AES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authentication_type_val_shared">
+    <comment></comment>        
+    <source>Shared</source>
+    <translation variants="no">Shared</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_28_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_adhoc_channel">
+    <comment>Setting label. WLAN ad-hoc network&apos;s channel number.</comment>        
+    <source>Ad-hoc channel</source>
+    <translation variants="no">Ad-hoc channel</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_25</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_pap_settings">
+    <comment></comment>        
+    <source>PAP settings</source>
+    <translation variants="no">PAP settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_scan_for_networks">
+    <comment></comment>        
+    <source>Scan for networks</source>
+    <translation variants="no">Scan for networks</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_acl">
+    <comment></comment>        
+    <source>ACL</source>
+    <translation variants="no">ACL</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_inner_eap_type">
+    <comment></comment>        
+    <source>Inner EAP type</source>
+    <translation variants="no">Inner EAP type</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_47</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_certificate">
+    <comment></comment>        
+    <source>User certificate</source>
+    <translation variants="no">User certificate</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_45</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_new_pac_store_password">
+    <comment></comment>        
+    <source>New PAC store password:</source>
+    <translation variants="no">New PAC store password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_07</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_57</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_configuring_connection_settings">
+    <comment></comment>        
+    <source>Configuring connection settings</source>
+    <translation variants="no">Configuring connection settings</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_03</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_select_conn_intranet">
+    <comment></comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_1</extra-loc-viewid>
+    <extra-loc-positionid>dblist_7</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_not_available">
+    <comment>Value for detail in details view.</comment>        
+    <source>Not available</source>
+    <translation variants="no">Not available</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_primary_dns">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Primary DNS</source>
+    <translation variants="no">Primary DNS</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_signal">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Signal</source>
+    <translation variants="no">Signal</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_mode">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Mode</source>
+    <translation variants="no">Mode</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_l1_mw">
+    <comment>Value for detail in details view.</comment>        
+    <source>%L1 mW</source>
+    <translation variants="no">%L1 mW</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_no_vpn_policies_installed">
+    <comment></comment>        
+    <source>No VPN policies installed.</source>
+    <translation variants="no">No VPN policies installed.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_open_network">
+    <comment>Value for detail in details view.</comment>        
+    <source>Open network</source>
+    <translation variants="no">Open network</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key">
+    <comment></comment>        
+    <source>WEP key</source>
+    <translation variants="no">WEP key</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_31</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_closed">
+    <comment>Value for detail in details view.</comment>        
+    <source>Closed</source>
+    <translation variants="no">Closed</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_dhedss3dessha">
+    <comment></comment>        
+    <source>DHE-DSS,3DES,SHA</source>
+    <translation variants="no">DHE-DSS,3DES,SHA</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_sent">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Sent</source>
+    <translation variants="no">Sent</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_cancel">
+    <comment>Cancel toolbutton for WLAN (and EAP/WPS) wizard</comment>        
+    <source>Cancel</source>
+    <translation variants="no">Cancel</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_name">
+    <comment>Custom layout ID parent. Heading for detail in details view.</comment>        
+    <source>Name</source>
+    <translation variants="no">Name</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_join_wlan_networks_val_known">
+    <comment></comment>        
+    <source>Known</source>
+    <translation variants="no">Known</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_wapi_client_cert_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_37_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_adhoc_channel_val_automatic">
+    <comment>Setting value. WLAN ad-hoc networ channel is determined automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_25_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_settings_received_for_multiple_wlan_n">
+    <comment></comment>        
+    <source>Settings received for multiple WLAN networks. Select the network to connect to:</source>
+    <translation variants="no">Settings received for multiple WLAN networks. Select the network to connect to:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_05</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_select_automatically">
+    <comment></comment>        
+    <source>Select automatically</source>
+    <translation variants="no">Select automatically</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wireless_lan">
+    <comment></comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_power_saving_val_disabled">
+    <comment></comment>        
+    <source>Disabled</source>
+    <translation variants="no">Disabled</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_connected_inactive">
+    <comment>Value for detail in details view.</comment>        
+    <source>Connected (inactive)</source>
+    <translation variants="no">Connected (inactive)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_new_wlan_networks_found">
+    <comment></comment>        
+    <source>New WLAN networks found:</source>
+    <translation variants="no">New WLAN networks found:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpophead_connection_failed">
+    <comment></comment>        
+    <source>Connection failed</source>
+    <translation variants="no">Connection failed</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_intranet">
+    <comment>List item, 2-row, primary text. Name of the Intranet destination.</comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_4</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_searching">
+    <comment></comment>        
+    <source>Searching</source>
+    <translation variants="no">Searching</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_6</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_password_val_prompt">
+    <comment></comment>        
+    <source>Prompt</source>
+    <translation variants="no">Prompt</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_43_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_destination_val_uncategorized">
+    <comment>TODO: to be removed</comment>        
+    <source>Uncategorized</source>
+    <translation variants="no">Uncategorized</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_12_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_port_number_val_not_define">
+    <comment>Setting value. Proxy server port number not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_20_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_priority_l1">
+    <comment>List item, 2-row, secondary text. Priority of an access point. %L1 is the priority number (1-n).</comment>        
+    <source>Priority: %L1</source>
+    <translation variants="no">Priority: %L1</translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_mode">
+    <comment>Setting label. WLAN network mode.</comment>        
+    <source>WLAN network mode</source>
+    <translation variants="no">WLAN network mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_14</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_val_automatic">
+    <comment>Setting value. IP address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_17_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_preshared_key_val_not_defined">
+    <comment></comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_33_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_4">
+    <comment></comment>        
+    <source>WEP key #4</source>
+    <translation variants="no">WEP key #4</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_switch_wlan_off">
+    <comment></comment>        
+    <source>Switch WLAN off</source>
+    <translation variants="no">Switch WLAN off</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_certificate_mismatch">
+    <comment></comment>        
+    <source>Certificate mismatch</source>
+    <translation variants="no">Certificate mismatch</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif_03</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wpa2_only">
+    <comment>Setting value. WLAN uses WPA2-only security.</comment>        
+    <source>WPA2 only</source>
+    <translation variants="no">WPA2 only</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_dns_addresses_val_user_defined">
+    <comment>Setting value. DNS addresses are user-defined.</comment>        
+    <source>User defined</source>
+    <translation variants="no">User defined</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_eap_password">
+    <comment></comment>        
+    <source>Password:</source>
+    <translation variants="no">Password:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_56</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_arrange">
+    <comment>Toolbar button. Sets the view to Arrange mode where drag-and-drop can be used to re-prioritise access points.</comment>        
+    <source>Arrange</source>
+    <translation variants="no">Arrange</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_for_1">
+    <comment></comment>        
+    <source>User name for &apos;%1&apos;:</source>
+    <translation variants="no">User name for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_55</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_uncategorized">
+    <comment>List item, 2-row, primary text. Name of the group of uncategorized access points not belonging to any destination.</comment>        
+    <source>Uncategorized</source>
+    <translation variants="no">Uncategorized</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_16</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_8021x">
+    <comment>Value for detail in details view.</comment>        
+    <source>802.1X</source>
+    <translation variants="no">802.1X</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_proxy_server_address_val_not_def">
+    <comment>Setting value. Proxy server address not defined.</comment>        
+    <source>(not defined)</source>
+    <translation variants="no">(not defined)</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_19_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_key_in_val_3">
+    <comment></comment>        
+    <source>#3</source>
+    <translation variants="no">#3</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_27_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_status">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Status</source>
+    <translation variants="no">Status</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dialog_enter_key_for_1">
+    <comment>Title for WLAN key query in wizard</comment>        
+    <source>Enter key for &apos;%1&apos;:</source>
+    <translation variants="no">Enter key for &apos;%1&apos;:</translation>
+    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_4</extra-loc-viewid>
+    <extra-loc-positionid>dialog_8</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_inner_eap">
+    <comment></comment>        
+    <source>Inner EAP</source>
+    <translation variants="no">Inner EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_network_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_17</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_share_to_other_destination">
+    <comment>Item specific menu item. Shares the selected access point to another destination, i.e. creates a virtual copy.</comment>        
+    <source>Share to other destination</source>
+    <translation variants="no">Share to other destination</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_enter_l1_on_wireless_station_then">
+    <comment></comment>        
+    <source>Enter &apos;%L1&apos; on wireless station then select &apos;Continue&apos;.</source>
+    <translation variants="no">Enter &apos;%L1&apos; on wireless station then select &apos;Continue&apos;.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_02</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_provisioning_mode">
+    <comment></comment>        
+    <source>Provisioning mode</source>
+    <translation variants="no">Provisioning mode</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_48</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_security_mode_val_wpawpa2_with_eap">
+    <comment></comment>        
+    <source>WPA with EAP</source>
+    <translation variants="no">WPA with EAP</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_infrastructure">
+    <comment>Value for detail in details view.</comment>        
+    <source>Infrastructure</source>
+    <translation variants="no">Infrastructure</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_intranet">
+    <comment>Simple label (groupbox). Name of the Intranet destination.</comment>        
+    <source>Intranet</source>
+    <translation variants="no">Intranet</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wapi">
+    <comment>Setting value. WLAN uses WAPI security.</comment>        
+    <source>WAPI</source>
+    <translation variants="no">WAPI</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wep_encryption">
+    <comment></comment>        
+    <source>WEP encryption</source>
+    <translation variants="no">WEP encryption</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_29</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_val_web_feeds">
+    <comment></comment>        
+    <source>Web feeds</source>
+    <translation variants="no">Web feeds</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_ignore">
+    <comment></comment>        
+    <source>Ignore</source>
+    <translation variants="no">Ignore</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_inform</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="yes" id="txt_occ_dblist_internet_val_ln_access_points">
+    <comment>List item, 2-row, secondary text. Number of access points (%Ln) defined in the destination in question.</comment>        
+    <source>%Ln access points</source>
+    <translation>
+        <numerusform variants="no">(s)%Ln access points</numerusform>
+        <numerusform variants="no">(p)%Ln access points</numerusform>
+    </translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>dblist_2_3_4_16_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_hexadecimal">
+    <comment></comment>        
+    <source>Hexadecimal</source>
+    <translation variants="no">Hexadecimal</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_04</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_39_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_authentication_unsuccessful">
+    <comment></comment>        
+    <source>Authentication unsuccessful</source>
+    <translation variants="no">Authentication unsuccessful</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_no_settings_received">
+    <comment></comment>        
+    <source>No settings received</source>
+    <translation variants="no">No settings received</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_network_name">
+    <comment>Setting label. WLAN network name (SSID). Label has no localisable values.</comment>        
+    <source>WLAN network name</source>
+    <translation variants="no">WLAN network name</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_12</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_use_pin_code_instead">
+    <comment></comment>        
+    <source>Use PIN code instead</source>
+    <translation variants="no">Use PIN code instead</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_remove_apn">
+    <comment></comment>        
+    <source>Remove &apos;%1&apos;?</source>
+    <translation variants="no">Remove &apos;%1&apos;?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri3_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_acl_remove_apn</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_pac_store_password_val_user_defin">
+    <comment></comment>        
+    <source>User defined</source>
+    <translation variants="no">User defined</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_05</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_49_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_invalid_characters_in_wep_key">
+    <comment></comment>        
+    <source>Invalid characters in WEP key</source>
+    <translation variants="no">Invalid characters in WEP key</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_open">
+    <comment></comment>        
+    <source>Open</source>
+    <translation variants="no">Open</translation>
+    <extra-loc-layout_id>qtl_list_popup_sec_add</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_3</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_tap_on_a_policy_to_set_a_default">
+    <comment></comment>        
+    <source>Tap on a policy to set a default.</source>
+    <translation variants="no">Tap on a policy to set a default.</translation>
+    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wpawpa2">
+    <comment></comment>        
+    <source>WPA/WPA2</source>
+    <translation variants="no">WPA/WPA2</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_32</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_internet">
+    <comment>Simple label (groupbox). Name of the Internet destination.</comment>        
+    <source>Internet</source>
+    <translation variants="no">Internet</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_connecting_to_1">
+    <comment>Status of WLAN in WLAN list view. WLAN is on, and connection establishment is in progress to access point name &apos;%1&apos;.</comment>        
+    <source>Connecting to &apos;%1&apos;</source>
+    <translation variants="no">Connecting to &apos;%1&apos;</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_cellular_data_val_l1_connections">
+    <comment></comment>        
+    <source>%L1 connections</source>
+    <translation variants="no">%L1 connections</translation>
+    <extra-loc-layout_id>qtl_indimenu_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_indicator_menu</extra-loc-viewid>
+    <extra-loc-positionid>dblist_14_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_move_to_other_destination">
+    <comment>Item specific menu item. Moves the selected access point to another destination.</comment>        
+    <source>Move to other destination</source>
+    <translation variants="no">Move to other destination</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_01</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_used_by">
+    <comment>Heading for detail in details view.</comment>        
+    <source>Used by</source>
+    <translation variants="no">Used by</translation>
+    <extra-loc-layout_id>txt_occ_list_name</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_user_name_val_generate_automatica">
+    <comment></comment>        
+    <source>Generate automatically</source>
+    <translation variants="no">Generate automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_40_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_select_access_point">
+    <comment></comment>        
+    <source>Select access point:</source>
+    <translation variants="no">Select access point:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_select_conn_dlg_2</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_eapmschapv2_settings">
+    <comment></comment>        
+    <source>EAP-MSCHAPv2 settings</source>
+    <translation variants="no">EAP-MSCHAPv2 settings</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett_02</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_secondary_name_server_val_automat">
+    <comment>Setting value. Secondary DNS address is fetched automatically.</comment>        
+    <source>Automatic</source>
+    <translation variants="no">Automatic</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_24_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_base_station_val_roam_to_bes">
+    <comment>Setting value. Device roams to best signal strength WLAN access point.</comment>        
+    <source>Roam to best</source>
+    <translation variants="no">Roam to best</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_03</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_26_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_val_authentic">
+    <comment></comment>        
+    <source>Authenticated</source>
+    <translation variants="no">Authenticated</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_settings_received_for_1_networ">
+    <comment></comment>        
+    <source>Settings received for &apos;%1&apos; network</source>
+    <translation variants="no">Settings received for &apos;%1&apos; network</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps_04</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_authority_certificate_val_select">
+    <comment></comment>        
+    <source>Select automatically</source>
+    <translation variants="no">Select automatically</translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_sett</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_44_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_check_security_key">
+    <comment></comment>        
+    <source>Check security key</source>
+    <translation variants="no">Check security key</translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_title_disconnect_from">
+    <comment></comment>        
+    <source>Maximum number of connections in use. Close an active connection first.</source>
+    <translation variants="no">Maximum number of connections in use. Close an active connection first.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_disconnect_dlg</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_grid_not_connected">
+    <comment>Status of WLAN in WLAN list view. WLAN is on, but not connected.</comment>        
+    <source>Not connected</source>
+    <translation variants="no">Not connected</translation>
+    <extra-loc-layout_id>txt_occ_grid_connected_to_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_setlabel_wlan_security_mode_val_wep">
+    <comment>Setting value. WLAN uses WEP security.</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_iap_ui_02</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_15_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_vpn">
+    <comment></comment>        
+    <source>VPN</source>
+    <translation variants="no">VPN</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_settings</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_preshared_key_too_short_at_least_8">
+    <comment></comment>        
+    <source>Pre-shared key too short. At least 8 characters must be entered.</source>
+    <translation variants="no">Pre-shared key too short. At least 8 characters must be entered.</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_dataform_error_01</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dpopinfo_internal_error">
+    <comment></comment>        
+    <source>Internal error </source>
+    <translation variants="no">Internal error </translation>
+    <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_connection_failed_01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_dblist_provisioning_mode_for_val_unauthent">
+    <comment></comment>        
+    <source>Unauthenticated</source>
+    <translation variants="no">Unauthenticated</translation>
+    <extra-loc-layout_id>txt_occ_dblist_security_mode_val_open</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_eap_wizard_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_18_val</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_subhead_wep_key_1">
+    <comment></comment>        
+    <source>WEP key #1</source>
+    <translation variants="no">WEP key #1</translation>
+    <extra-loc-layout_id>qtl_groupbox_expand_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_sec_sett_01</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wep">
+    <comment>Value for detail in details view.</comment>        
+    <source>WEP</source>
+    <translation variants="no">WEP</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_opt_add_new_wlan">
+    <comment></comment>        
+    <source>Add new WLAN</source>
+    <translation variants="no">Add new WLAN</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_info_expires">
+    <comment></comment>        
+    <source>Expires: %1</source>
+    <translation variants="no">Expires: %1</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wlan_eap_notif</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_continue">
+    <comment></comment>        
+    <source>Continue</source>
+    <translation variants="no">Continue</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_1</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_wps</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_menu_enable_network">
+    <comment></comment>        
+    <source>Enable network</source>
+    <translation variants="no">Enable network</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_list</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_wireless_lan">
+    <comment>Value for detail in details view.</comment>        
+    <source>Wireless LAN</source>
+    <translation variants="no">Wireless LAN</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_button_finish">
+    <comment>finish toolbutton for WLAN wizard summary page</comment>        
+    <source>Finish</source>
+    <translation variants="no">Finish</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny_3</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_add_wlan_5</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_occ_list_connected_active">
+    <comment>Custom layout ID parent. Value for detail in details view.</comment>        
+    <source>Connected (active)</source>
+    <translation variants="no">Connected (active)</translation>
+    <extra-loc-layout_id>txt_occ_list_connected_active</extra-loc-layout_id>    
+    <extra-loc-viewid>occ_details</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>oc</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+</context>
+</TS>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/rom/cpwpaui.iby	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef CPWPAUI_IBY
+#define CPWPAUI_IBY
+
+#include <data_caging_paths_for_iby.hrh>
+#include <bldvariant.hrh>
+
+file=ABI_DIR/BUILD_DIR/cpwpaui.dll SHARED_LIB_DIR/cpwpaui.dll
+data=/epoc32/data/c/resource/qt/plugins/controlpanel/wlansecurity/cpwpaui.qtplugin resource/qt/plugins/controlpanel/wlansecurity/cpwpaui.qtplugin
+
+
+#endif // CPWPAUI_IBY
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/src/cpwpaui.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *    Control Panel QT UI for WPA/WPA2 configuration
+ *
+ */
+
+/*
+ * %version: tr1cfwln#21.1.1 %
+ */
+//User Includes
+#include "cpwpaui.h"
+#include "cpwpacmnui.h"
+#include "wpakeyvalidator.h"
+
+// System includes
+#include <QStringList>
+#include <HbDeviceNotificationDialog>
+#include <QLocale>
+#include <qtranslator.h>
+#include <QCoreApplication>
+#include <cmconnectionmethod_shim.h>
+#include <cmmanagerdefines_shim.h>
+#include <eapqtconfiginterface.h>
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpwpauiTraces.h"
+#endif
+
+//Constants
+//The order in which WPA/WPA2 only mode appears in the list of available 
+//security modes
+const int UI_ORDER_WPA_WPA2 = 40;
+/*!
+ \class CpWpaUi
+ \brief CpWpaUi implements the common Ui for WPA/WPA2 
+ Security Settings Control Panel Plugins,
+ which will allow viewing/editing of WPA/WPA2 Security Settings.
+ */
+//Contructs WPA/WPA2 object
+CpWpaUi::CpWpaUi() :
+    mUi(NULL), mCmCM(NULL), mEapQtConfigInterface(NULL)
+{
+    mTranslator = new QTranslator(this);
+    mTranslator->load(":/loc/wlan_en_GB.qm");
+
+    qApp->installTranslator(mTranslator);
+
+}
+
+//Deletes all objects WPA/WPA2 owns
+CpWpaUi::~CpWpaUi()
+{
+    OstTraceFunctionEntry1(CPWPAUI_CPWPAUI_ENTRY,this);
+    //delete mEapQtConfigInterface;
+    OstTraceFunctionExit1(CPWPAUI_CPWPAUI_EXIT,this);
+}
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ Getter for security mode.
+
+ \return Security mode identifier
+ */
+CMManagerShim::WlanSecMode CpWpaUi::securityMode() const
+{
+    OstTraceFunctionEntry1(CPWPAUI_MODE_ENTRY,this);
+    OstTraceFunctionExit1(CPWPAUI_MODE_EXIT,this);
+    //return security mode
+    return CMManagerShim::WlanSecModeWpa;
+}
+
+/*!
+ Getter for localization text identifier for the security mode,
+ f.ex. "txt_occ_setlabel_wlan_security_mode_val_wpawpa2". This localized
+ text will be shown in the UI.
+ 
+ \return Localization text ID
+ */
+QString CpWpaUi::securityModeTextId() const
+{
+    OstTraceFunctionEntry1(CPWPAUI_LOCALIZATIONID_ENTRY,this); 
+    OstTraceFunctionExit1(CPWPAUI_LOCALIZATIONID_EXIT,this);
+    return "txt_occ_setlabel_wlan_security_mode_val_wpawpa2";
+}
+
+/*! 
+ Sets the database reference (WLAN Service Table ID).
+
+ \param id Database reference
+ */
+void CpWpaUi::setReference(CmConnectionMethodShim *cmCm, uint id)
+{
+    OstTraceFunctionEntry1(CPWPAUI_SETREFERENCE_ENTRY,this);
+    // Assuming that id is the connection method Id/IAP Id.
+    mCmId = id;
+
+    /*if (!mEapQtConfigInterface) {
+     mEapQtConfigInterface = new EapQtConfigInterface(
+     EapQtConfigInterface::EapBearerTypeWlan, mCmId);
+     // fix, hangs
+     }*/
+
+    //mCmCM is not deleted assuming mCmManager owns it.
+    mCmCM = cmCm;
+    OstTraceFunctionExit1(CPWPAUI_SETREFERENCE_EXIT,this);
+}
+
+/*!
+ Getter for order number. This order number is used by the client of
+ this interface to put the security modes in correct order in the list.
+
+ \return An order number
+ */
+int CpWpaUi::orderNumber() const
+{
+    OstTraceFunctionEntry1(CPWPAUI_ORDERNUMBER_ENTRY,this); 
+    OstTraceFunctionExit1(CPWPAUI_ORDERNUMBER_EXIT,this);
+    return UI_ORDER_WPA_WPA2;
+}
+
+/*!
+ Creates an UI instance. Caller owns the object.
+ 
+ \param dataHelper Item data helper
+ \return Pointer to an UI object
+ */
+CpSettingFormItemData* CpWpaUi::uiInstance(CpItemDataHelper &dataHelper)
+{
+    OstTraceFunctionEntry1(CPWPAUI_UIINSTANCE_ENTRY,this);
+
+		//reset the Common Ui Ptr
+    mWpaUi.reset(new CpWpaCmnUi(CMManagerShim::WlanSecModeWpa, dataHelper));
+
+    mUi = mWpaUi->createUi(mEapQtConfigInterface, mCmCM);
+
+    connect(mWpaUi.data(), SIGNAL(keyChanged(QString&)), this, SLOT(pskKeyChanged(QString&)));
+
+    connect(mWpaUi.data(), SIGNAL(pskEapModeToggled(int)), this, SLOT(wpaTypeChanged(int)));
+
+    connect(mWpaUi.data(), SIGNAL(eapPluginChanged(int)), this, SLOT(currentEapPlugin(int)));
+    //}
+    OstTraceFunctionExit1(CPWPAUI_UIINSTANCE_EXIT,this);
+    return mUi;
+}
+
+
+// ======== LOCAL FUNCTIONS ========
+
+/*!
+ Slot to handle change in wpa mode :- PSK /EAP
+
+ \param pskEnable the current mode chosen
+ */
+/*void CpWpaUi::wpaTypeChanged(int pskEnable)
+{
+    int err;
+    OstTraceFunctionEntry1(CPWPAUI_WPATYPECHANGED_ENTRY,this);
+
+    bool PskEnable = pskEnable ? ETrue : EFalse;
+
+    QT_TRYCATCH_ERROR(err,mCmCM->setBoolAttribute(CMManagerShim::WlanEnableWpaPsk, PskEnable));
+    
+    if(err !=KErrNone) {
+              OstTrace1( TRACE_ERROR, CPWPAUI_WPATYPECHANGED, "ERROR WPA/WPA2 wpatypereturned returned %d", err );
+    }
+    tryUpdate();
+    OstTraceFunctionExit1(CPWPAUI_WPATYPECHANGED_EXIT,this);
+}*/
+
+/*!
+ Slot to handle change in pre-shared key string
+
+ \param key changed string for PSK
+ */
+void CpWpaUi::pskKeyChanged(QString &key)
+{
+    int err;
+    OstTraceFunctionEntry1(CPWPAUI_PSKKEYCHANGED_ENTRY,this);
+    //Store to native s60 type for validation 
+    TPtrC ptrName(reinterpret_cast<const TText*> (key.constData()));
+
+    //Check for Validity of Pre-shared Key
+    WpaKeyValidator::KeyStatus keystatus = WpaKeyValidator::validateWpaKey(key);
+
+    if (keystatus == WpaKeyValidator::KeyStatusOk) {
+
+        QT_TRYCATCH_ERROR(err,mCmCM->setString8Attribute(CMManagerShim::WlanWpaPreSharedKey, key));
+        if(err !=KErrNone) {
+          OstTrace1( TRACE_ERROR,CPWPAUI_PSKKEYCHANGED, "ERROR WPA/WPA2: pskKeyChanged returned %d", err );
+        }
+        tryUpdate();
+    }
+    else {
+    showMessageBox(HbMessageBox::MessageTypeWarning, hbTrId(
+                      "txt_occ_info_invalid_input"));
+    }
+    OstTraceFunctionExit1(CPWPAUI_PSKKEYCHANGED_EXIT,this);
+}
+
+/*!
+ Slot to handle change in eap method in use
+ \param currentplugin plugin number to indicate the
+ eap method in use
+ */
+/*void CpWpaUi::currentEapPlugin(int  plugin )
+{
+    OstTraceFunctionEntry1(CPWPAUI_CURRENTEAPPLUGIN_ENTRY,this);
+
+    //define enum to store the current EAP type
+    //mCmCM->setIntAttribute( use appropriate enum to get the eap plugin index );
+    OstTraceFunctionExit1(CPWPAUI_CURRENTEAPPLUGIN_EXIT,this);
+}*/
+
+bool CpWpaUi::tryUpdate()
+{
+    OstTraceFunctionEntry1(CPWPAUI_TRYUPDATE_ENTRY,this);
+
+    // Try update
+    try {
+        mCmCM->update();
+    } catch (const std::exception&) {
+        // Handle error
+        handleUpdateError();
+
+        OstTraceFunctionExit1(CPWPAUI_TRYUPDATE_EXIT,this);
+        return false;
+    }
+
+    OstTraceFunctionExit1(DUP1_CPWPAUI_TRYUPDATE_EXIT,this);
+    return true;
+}
+
+/*!
+ Handles failed CommsDat update.
+ */
+void CpWpaUi::handleUpdateError()
+{
+    OstTraceFunctionEntry1(CPWPAUI_HANDLEUPDATEERROR_ENTRY,this);
+
+    // Show error note to user
+    showMessageBox(HbMessageBox::MessageTypeWarning, hbTrId("txt_occ_info_unable_to_save_setting"));
+    // Reload settings from CommsDat and update UI
+    try {
+        mCmCM->refresh();
+    } catch (const std::exception&) {
+        // Ignore error from refresh. Most likely this will not happen, but
+        // if it does, there isn't very much we can do.
+        OstTrace0(
+            TRACE_ERROR,
+            CPWPAUI_HANDLEUPDATEERROR,
+            "Refresh failed");
+    };
+    updateWpaSettings();
+
+    OstTraceFunctionExit1(CPWPAUI_HANDLEUPDATEERROR_EXIT,this);
+}
+
+/*!
+ Shows message box with "OK" button using given text.
+ */
+void CpWpaUi::showMessageBox(HbMessageBox::MessageBoxType type, const QString &text)
+{
+    OstTraceFunctionEntry1(CPWPAUI_SHOWMESSAGEBOX_ENTRY,this);
+
+    // Create a message box
+    mMessageBox = QSharedPointer<HbMessageBox> (new HbMessageBox(type));
+    mMessageBox->setText(text);
+    mMessageBox->open();
+
+    OstTraceFunctionExit1(CPWPAUI_SHOWMESSAGEBOX_EXIT,this);
+}
+
+void CpWpaUi::updateWpaSettings()
+{
+    OstTraceFunctionEntry1(CPWPAUI_UPDATEWPASETTINGS_ENTRY,this);
+    mWpaUi->reset();
+    OstTraceFunctionExit1(CPWPAUI_UPDATEWPASETTINGS_EXIT,this);
+}
+
+Q_EXPORT_PLUGIN2(CpWpaUi, CpWpaUi)
+;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/src/wpakeyvalidator.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   Validate WPA/WPA2 & WPA2 only keys
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#include <QString>
+#include "wpakeyvalidator.h"
+
+/*!
+    \class WpaKeyValidator wpakeyvalidator.cpp
+    \brief Utilities for WPA/WPA2 key validations.
+    
+*/
+/*!
+    \enum WpaKeyValidator::KeyStatus
+    This enum defines the validation results.
+
+    \var WpaKeyValidator::KeyStatusOk
+    Key is valid.
+    
+    \var WpaKeyValidator::KeyStatusIllegalCharacters
+    Key contains illegal characters.
+    
+    \var WpaKeyValidator::KeyStatusWpaTooShort
+    WPA key is too short. Minimum allowed length is 8. See 
+    WlanWizardUtils::validateWpaKey().
+    
+    \var WpaKeyValidator::KeyStatusWpaTooLong
+    WPA key is too long. Minimum allowed length is 64 for hex key and 63 for 
+    ascii key. See WlanWizardUtils::validateWpaKey().
+      
+*/
+
+/*! 
+ * Process WPA key validation. A passphrase can contain from 8 to 63 ASCII
+ * characters where each character MUST have a decimal encoding in the range of
+ * 32 to 126, inclusive.
+ *
+ * A preshared key is stored as 64 character hex string.
+ * 
+ * @param key PSK to be validated
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ * - KeyStatusWpaTooShort
+ * - KeyStatusWpaTooLong
+ */
+WpaKeyValidator::KeyStatus WpaKeyValidator::validateWpaKey(const QString &key)
+{
+    int length = key.length();
+    KeyStatus ret = KeyStatusOk;
+
+    if (length < WpaMinLenght) {
+        ret = KeyStatusWpaTooShort;
+    }
+    else if (length > WpaMaxLenght) {
+        ret = KeyStatusWpaTooLong;
+    }
+    // hex string
+    else if (length == WpaMaxLenght) {
+        ret = isHex(key);
+    }
+    else {
+        ret = isAscii(key);
+    }
+
+    return ret;
+}
+
+
+/*!
+ * Process Ascii validation. Allowed characters are from 32 to 126.
+ * 
+ * @param key to be validated.
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ */
+WpaKeyValidator::KeyStatus WpaKeyValidator::isAscii(const QString &key)
+{
+    QChar ch32(32);
+    QChar ch126(126);
+
+    const QChar *data = key.data();
+    while (!data->isNull()) {
+        if ((*data) < ch32 || (*data) > ch126) {
+            return KeyStatusIllegalCharacters;
+        }
+        ++data;
+    }
+    return KeyStatusOk;
+}
+
+/*!
+ * Process Hex validation. Allowed characters are
+ * - from 0 to 9
+ * - from a to f
+ * - from A to F
+ * 
+ * @param key to be validated.
+ * 
+ * @return Following values are possible
+ * - KeyStatusOk
+ * - KeyStatusIllegalCharacters
+ */
+WpaKeyValidator::KeyStatus WpaKeyValidator::isHex(const QString &key)
+{
+    QChar ch_A(65); // Character: A
+    QChar ch_F(70); // Character: F
+    QChar ch_a(97); // Character: a
+    QChar ch_f(102);// Character: f
+
+    const QChar *data = key.data();
+    while (!data->isNull()) {
+        if (data->isDigit() ||
+            (*data) >= ch_a && (*data) <= ch_f ||
+            (*data) >= ch_A && (*data) <= ch_F) {
+            ++data;
+        }
+        else {
+            return KeyStatusIllegalCharacters;
+        }
+    }
+    return KeyStatusOk;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/traces/OstTraceDefinitions.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: .
+ *   
+ *
+ */
+ 
+ 
+/*
+ * %version: 2 %
+ */
+
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+#include <opensystemtrace.h>
+#endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/inc/cpeapplugininterface.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*   Control Panel plug-in interface for EAP method configuration QT UIs
+*
+*/
+
+/*
+* %version: 1 %
+*/
+
+
+#ifndef CPEAPPLUGININTERFACE_H
+#define CPEAPPLUGININTERFACE_H
+
+#include <QtPlugin>
+#include "eapqtplugininfo.h"
+
+class CpBaseSettingView;
+class EapQtConfigInterface;
+
+
+class CpEapPluginInterface
+{
+public:
+    virtual ~CpEapPluginInterface()
+    {
+    }
+    ;
+
+    virtual void setEapQtConfigInterface(EapQtConfigInterface* configIf) = 0;
+
+    virtual QList<EapQtPluginInfo> pluginInfo() = 0;
+
+    virtual CpBaseSettingView* uiInstance(
+        const EapQtPluginInfo &plugin) = 0;
+};
+
+Q_DECLARE_INTERFACE(CpEapPluginInterface,
+    "com.nokia.plugin.controlpanel.eap.platform.interface/1.0");
+
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/inc/eapqtconfiginterface.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   EAP method configuration QT interface
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#ifndef EAPQTCONFIGINTERFACE_H
+#define EAPQTCONFIGINTERFACE_H
+
+#include <qglobal.h>
+
+#ifdef BUILD_EAP_QT_CONFIG_INTERFACE_DLL
+#define EAP_QT_CONFIG_INTERFACE_EXPORT Q_DECL_EXPORT
+#else
+#define EAP_QT_CONFIG_INTERFACE_EXPORT Q_DECL_IMPORT
+#endif
+
+class EapQtPluginInfo;
+class EapQtPluginHandle;
+class CpBaseSettingView;
+
+class EAP_QT_CONFIG_INTERFACE_EXPORT EapQtConfigInterface
+{
+public:
+    enum EapBearerType
+    {
+        EapBearerTypeWlan, EapBearerTypeVpn,
+    };
+public:
+    EapQtConfigInterface(const EapBearerType bearerType, const int databaseIndex);
+    ~EapQtConfigInterface();
+
+    QList<EapQtPluginInfo> supportedOuterTypes() const;
+
+    CpBaseSettingView *uiInstance(const EapQtPluginHandle& pluginInfo) const;
+
+private:
+};
+
+#endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/inc/eapqtpluginhandle.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   Control Panel EAP plugin information
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#ifndef EAPQTPLUGINHANDLE_H
+#define EAPQTPLUGINHANDLE_H
+
+#include <qglobal.h>
+
+#ifdef BUILD_EAP_QT_PLUGIN_INFO_DLL
+#define EAP_QT_PLUGIN_HANDLE_EXPORT Q_DECL_EXPORT
+#else
+#define EAP_QT_PLUGIN_HANDLE_EXPORT Q_DECL_IMPORT
+#endif
+
+class EAP_QT_PLUGIN_HANDLE_EXPORT EapQtPluginHandle
+{
+
+public:
+
+    EapQtPluginHandle();
+    ~EapQtPluginHandle();
+
+private:
+
+};
+
+#endif /* EAPQTPLUGINHANDLE_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/inc/eapqtplugininfo.h	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   Control Panel EAP plugin information
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#ifndef EAPQTPLUGININFO_H
+#define EAPQTPLUGININFO_H
+
+#include "eapqtpluginhandle.h"
+
+#ifdef BUILD_EAP_QT_PLUGIN_INFO_DLL
+#define EAP_QT_PLUGIN_INFO_EXPORT Q_DECL_EXPORT
+#else
+#define EAP_QT_PLUGIN_INFO_EXPORT Q_DECL_IMPORT
+#endif
+
+class EAP_QT_PLUGIN_INFO_EXPORT EapQtPluginInfo
+{
+public:
+    EapQtPluginInfo(EapQtPluginHandle id, QString locId, int orderNumber );
+    ~EapQtPluginInfo();
+
+    EapQtPluginHandle pluginHandle() const;
+    QString localizationId() const;
+    int orderNumber() const;
+    
+private:
+    EapQtPluginInfo();
+
+private:
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/bwins/eapqtconfiginterfaceu.def	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,6 @@
+EXPORTS
+	??0EapQtConfigInterface@@QAE@W4EapBearerType@0@H@Z @ 1 NONAME ; EapQtConfigInterface::EapQtConfigInterface(enum EapQtConfigInterface::EapBearerType, int)
+	?supportedOuterTypes@EapQtConfigInterface@@QBE?AV?$QList@VEapQtPluginInfo@@@@XZ @ 2 NONAME ; class QList<class EapQtPluginInfo> EapQtConfigInterface::supportedOuterTypes(void) const
+	?uiInstance@EapQtConfigInterface@@QBEPAVCpBaseSettingView@@ABVEapQtPluginHandle@@@Z @ 3 NONAME ; class CpBaseSettingView * EapQtConfigInterface::uiInstance(class EapQtPluginHandle const &) const
+	??1EapQtConfigInterface@@QAE@XZ @ 4 NONAME ; EapQtConfigInterface::~EapQtConfigInterface(void)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/bwins/eapqtplugininfou.def	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,9 @@
+EXPORTS
+	?pluginHandle@EapQtPluginInfo@@QBE?AVEapQtPluginHandle@@XZ @ 1 NONAME ; class EapQtPluginHandle EapQtPluginInfo::pluginHandle(void) const
+	?localizationId@EapQtPluginInfo@@QBE?AVQString@@XZ @ 2 NONAME ; class QString EapQtPluginInfo::localizationId(void) const
+	??0EapQtPluginHandle@@QAE@XZ @ 3 NONAME ; EapQtPluginHandle::EapQtPluginHandle(void)
+	??0EapQtPluginInfo@@QAE@VEapQtPluginHandle@@VQString@@H@Z @ 4 NONAME ; EapQtPluginInfo::EapQtPluginInfo(class EapQtPluginHandle, class QString, int)
+	?orderNumber@EapQtPluginInfo@@QBEHXZ @ 5 NONAME ; int EapQtPluginInfo::orderNumber(void) const
+	??1EapQtPluginHandle@@QAE@XZ @ 6 NONAME ; EapQtPluginHandle::~EapQtPluginHandle(void)
+	??1EapQtPluginInfo@@QAE@XZ @ 7 NONAME ; EapQtPluginInfo::~EapQtPluginInfo(void)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/eabi/eapqtconfiginterfaceu.def	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,8 @@
+EXPORTS
+	_ZN20EapQtConfigInterfaceC1ENS_13EapBearerTypeEi @ 1 NONAME
+	_ZN20EapQtConfigInterfaceC2ENS_13EapBearerTypeEi @ 2 NONAME
+	_ZN20EapQtConfigInterfaceD1Ev @ 3 NONAME
+	_ZN20EapQtConfigInterfaceD2Ev @ 4 NONAME
+	_ZNK20EapQtConfigInterface10uiInstanceERK17EapQtPluginHandle @ 5 NONAME
+	_ZNK20EapQtConfigInterface19supportedOuterTypesEv @ 6 NONAME
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/eabi/eapqtplugininfou.def	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,13 @@
+EXPORTS
+	_ZN15EapQtPluginInfoC1E17EapQtPluginHandle7QStringi @ 1 NONAME
+	_ZN15EapQtPluginInfoC2E17EapQtPluginHandle7QStringi @ 2 NONAME
+	_ZN15EapQtPluginInfoD1Ev @ 3 NONAME
+	_ZN15EapQtPluginInfoD2Ev @ 4 NONAME
+	_ZN17EapQtPluginHandleC1Ev @ 5 NONAME
+	_ZN17EapQtPluginHandleC2Ev @ 6 NONAME
+	_ZN17EapQtPluginHandleD1Ev @ 7 NONAME
+	_ZN17EapQtPluginHandleD2Ev @ 8 NONAME
+	_ZNK15EapQtPluginInfo11orderNumberEv @ 9 NONAME
+	_ZNK15EapQtPluginInfo12pluginHandleEv @ 10 NONAME
+	_ZNK15EapQtPluginInfo14localizationIdEv @ 11 NONAME
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/eapqtconfiginterface/eapqtconfiginterface.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,72 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#	EAP method configuration QT interface
+#
+
+# %version: 1 %
+
+
+TEMPLATE            = lib
+TARGET              = eapqtconfiginterface
+TARGET.CAPABILITY   = CAP_GENERAL_DLL
+DEFINES             += BUILD_EAP_QT_CONFIG_INTERFACE_DLL
+DEPENDPATH          += . 
+
+# Store generated files to their own directories
+MOC_DIR     = _moc
+RCC_DIR     = _rcc
+OBJECTS_DIR = _objects
+
+# hb config needed when hb classes are used
+CONFIG += hb
+
+LIBS += \
+    -leapqtplugininfo
+
+INCLUDEPATH += \
+	../../inc \
+    $$MW_LAYER_SYSTEMINCLUDE \
+    $$OS_LAYER_SYSTEMINCLUDE
+    
+HEADERS += 
+
+SOURCES += \
+    src/eapqtconfiginterface.cpp
+    
+defFilePath = ..
+
+symbian { 
+    # no Symbian only headers
+    HEADERS += 
+    
+    # no Symbian only sources
+    SOURCES += 
+    
+    # add needed Symbian libs here
+    LIBS += 
+        
+    TARGET.UID3 = 0x2002C2FC
+    TARGET.EPOCALLOWDLLDATA = 1
+    
+    TARGET.CAPABILITY = CAP_GENERAL_DLL
+    
+    # exports not frozen yet
+    # MMP_RULES += EXPORTUNFROZEN
+    BLD_INF_RULES.prj_exports += \
+        "$${LITERAL_HASH}include <platform_paths.hrh>"
+        
+    BLD_INF_RULES.prj_exports += \ 
+  		"rom/eapqtconfiginterface.iby CORE_MW_LAYER_IBY_EXPORT_PATH(eapqtconfiginterface.iby)"
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/eapqtconfiginterface/src/eapqtconfiginterface.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   EAP method configuration QT interface
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#include <QList>
+
+#include "eapqtconfiginterface.h"
+#include "cpeapplugininterface.h"
+#include "eapqtplugininfo.h"
+
+//----------------------------------------------------------------------------
+//              EapQtConfigInterface
+//----------------------------------------------------------------------------
+
+// stub implementation for now
+
+EapQtConfigInterface::EapQtConfigInterface(const EapBearerType /* bearerType */, const int /* databaseIndex */)
+{
+}
+
+EapQtConfigInterface::~EapQtConfigInterface()
+{
+}
+
+QList<EapQtPluginInfo> EapQtConfigInterface::supportedOuterTypes() const
+{
+    // stub
+    QList<EapQtPluginInfo> tmp;
+    return tmp;
+}
+
+CpBaseSettingView *EapQtConfigInterface::uiInstance(const EapQtPluginHandle& /* pluginInfo */) const
+{
+    // stub
+    return NULL;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/eapqtplugininfo/eapqtplugininfo.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#   QT EAP plugin information handling component
+#
+
+# %version: 1 %
+
+
+TEMPLATE            = lib
+TARGET              = eapqtplugininfo
+TARGET.CAPABILITY   = CAP_GENERAL_DLL
+DEFINES             += BUILD_EAP_QT_PLUGIN_INFO_DLL
+DEPENDPATH          += . 
+
+# Store generated files to their own directories
+MOC_DIR     = _moc
+RCC_DIR     = _rcc
+OBJECTS_DIR = _objects
+
+# hb config needed when hb classes are used
+CONFIG += hb
+
+INCLUDEPATH += \
+	../../inc \
+    $$MW_LAYER_SYSTEMINCLUDE
+    
+HEADERS += 
+
+SOURCES += \
+    src/eapqtplugininfo.cpp \
+    src/eapqtpluginhandle.cpp
+    
+defFilePath = ..
+
+symbian { 
+    # no Symbian only headers
+    HEADERS += 
+    
+    # no Symbian only sources
+    SOURCES += 
+    
+    # add needed Symbian libs here
+    LIBS +=
+    
+    TARGET.UID3 = 0x2002C2FD
+    TARGET.EPOCALLOWDLLDATA = 1
+    
+    TARGET.CAPABILITY = CAP_GENERAL_DLL
+    
+    # exports not frozen yet
+    # MMP_RULES += EXPORTUNFROZEN
+    BLD_INF_RULES.prj_exports += \
+        "$${LITERAL_HASH}include <platform_paths.hrh>"
+        
+    BLD_INF_RULES.prj_exports += \ 
+  		"rom/eapqtplugininfo.iby CORE_MW_LAYER_IBY_EXPORT_PATH(eapqtplugininfo.iby)"        
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/eapqtplugininfo/rom/eapqtplugininfo.iby	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*   EAP method configuration QT interface
+*
+*/
+
+/*
+* %version: 2 %
+*/
+
+#ifndef __EAPQTPLUGININFO_IBY__
+#define __EAPQTPLUGININFO_IBY__
+
+#include <bldvariant.hrh>
+#include <data_caging_paths_for_iby.hrh>
+
+file=ABI_DIR\BUILD_DIR\eapqtplugininfo.dll SHARED_LIB_DIR\eapqtplugininfo.dll
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/eapqtplugininfo/src/eapqtpluginhandle.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   Control Panel EAP plugin information
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#include "eapqtpluginhandle.h"
+
+//----------------------------------------------------------------------------
+//              EapQtPluginHandle
+//----------------------------------------------------------------------------
+
+// stub implementation for now
+
+EapQtPluginHandle::EapQtPluginHandle()
+{
+}
+
+EapQtPluginHandle::~EapQtPluginHandle()
+{
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/eapqtplugininfo/src/eapqtplugininfo.cpp	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: 
+ *   Control Panel EAP plug-in information
+ *
+ */
+
+/*
+ * %version: 1 %
+ */
+
+#include <QList>
+#include <QVariant>
+
+#include "eapqtplugininfo.h"
+
+//----------------------------------------------------------------------------
+//              EapQtPluginInfo
+//----------------------------------------------------------------------------
+
+// stub implementation for now
+
+EapQtPluginInfo::EapQtPluginInfo(EapQtPluginHandle /* id */, QString /* locId */, int /* orderNumber */)
+{
+}
+
+EapQtPluginInfo::~EapQtPluginInfo()
+{
+}
+
+EapQtPluginHandle EapQtPluginInfo::pluginHandle() const
+{
+    EapQtPluginHandle tmp;
+    return tmp;
+}
+
+QString EapQtPluginInfo::localizationId() const
+{
+    return QString();
+}
+
+int EapQtPluginInfo::orderNumber() const
+{
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/qtconfigutils/qtconfigutils.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#    EAP QT utility components
+#
+
+# %version: 1 %
+
+TEMPLATE = subdirs
+SUBDIRS = eapqtplugininfo eapqtconfiginterface
+CONFIG += ordered
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/securitysettings/securitysettings.pro	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+# %version: 2 %
+
+TEMPLATE = subdirs
+
+SUBDIRS  += qtconfigutils cpwlansecurityuiplugins
+
+CONFIG += ordered
--- a/sysdef_1_4_0.dtd	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_5_1.dtd	Fri May 14 15:54:13 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  
--- a/wlansecuritysettings/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Build information file
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-#include "../wapisecuritysettingsui/stub/group/bld.inf"
-#include "../wepsecuritysettingsui/group/bld.inf"
-#include "../wifiprotectedsetup/group/bld.inf"
-#include "../wlaneapsettingsui/group/bld.inf"
-#include "../wpasecuritysettingsui/group/bld.inf"
-
-PRJ_TESTMMPFILES
\ No newline at end of file
--- a/wlansecuritysettings/wapisecuritysettingsui/bwinscw/wapisecuritysettingsuiu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-EXPORTS
-	?LoadL@CWAPISecuritySettings@@QAEXKAAVCMDBSession@CommsDat@@@Z @ 1 NONAME ; void CWAPISecuritySettings::LoadL(unsigned long, class CommsDat::CMDBSession &)
-	?SetPreSharedKeyL@CWAPISecuritySettings@@QAEXW4TWapiKeyFormat@1@ABVTDesC16@@@Z @ 2 NONAME ; void CWAPISecuritySettings::SetPreSharedKeyL(enum CWAPISecuritySettings::TWapiKeyFormat, class TDesC16 const &)
-	?EditL@CWAPISecuritySettings@@QAEHAAVCWAPISecuritySettingsUi@@ABVTDesC16@@@Z @ 3 NONAME ; int CWAPISecuritySettings::EditL(class CWAPISecuritySettingsUi &, class TDesC16 const &)
-	?SaveL@CWAPISecuritySettings@@QBEXKAAVCMDBSession@CommsDat@@@Z @ 4 NONAME ; void CWAPISecuritySettings::SaveL(unsigned long, class CommsDat::CMDBSession &) const
-	?NewL@CWAPISecuritySettings@@SAPAV1@XZ @ 5 NONAME ; class CWAPISecuritySettings * CWAPISecuritySettings::NewL(void)
-	??1CWAPISecuritySettings@@UAE@XZ @ 6 NONAME ; CWAPISecuritySettings::~CWAPISecuritySettings(void)
-	??1CWAPISecuritySettingsUi@@UAE@XZ @ 7 NONAME ; CWAPISecuritySettingsUi::~CWAPISecuritySettingsUi(void)
-	?NewL@CWAPISecuritySettingsUi@@SAPAV1@AAVCEikonEnv@@@Z @ 8 NONAME ; class CWAPISecuritySettingsUi * CWAPISecuritySettingsUi::NewL(class CEikonEnv &)
-	?DeleteAPSpecificDataL@CWAPISecuritySettings@@QAEXH@Z @ 9 NONAME ; void CWAPISecuritySettings::DeleteAPSpecificDataL(int)
-	?IsValid@CWAPISecuritySettings@@QBEHXZ @ 10 NONAME ; int CWAPISecuritySettings::IsValid(void) const
-
--- a/wlansecuritysettings/wapisecuritysettingsui/eabi/wapisecuritysettingsuiu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-EXPORTS
-	_ZN21CWAPISecuritySettings16SetPreSharedKeyLENS_14TWapiKeyFormatERK7TDesC16 @ 1 NONAME
-	_ZN21CWAPISecuritySettings21DeleteAPSpecificDataLEi @ 2 NONAME
-	_ZN21CWAPISecuritySettings4NewLEv @ 3 NONAME
-	_ZN21CWAPISecuritySettings5EditLER23CWAPISecuritySettingsUiRK7TDesC16 @ 4 NONAME
-	_ZN21CWAPISecuritySettings5LoadLEmRN8CommsDat11CMDBSessionE @ 5 NONAME
-	_ZN21CWAPISecuritySettingsD0Ev @ 6 NONAME
-	_ZN21CWAPISecuritySettingsD1Ev @ 7 NONAME
-	_ZN21CWAPISecuritySettingsD2Ev @ 8 NONAME
-	_ZN23CWAPISecuritySettingsUi4NewLER9CEikonEnv @ 9 NONAME
-	_ZN23CWAPISecuritySettingsUiD0Ev @ 10 NONAME
-	_ZN23CWAPISecuritySettingsUiD1Ev @ 11 NONAME
-	_ZN23CWAPISecuritySettingsUiD2Ev @ 12 NONAME
-	_ZNK21CWAPISecuritySettings5SaveLEmRN8CommsDat11CMDBSessionE @ 13 NONAME
-	_ZNK21CWAPISecuritySettings7IsValidEv @ 14 NONAME
-
--- a/wlansecuritysettings/wapisecuritysettingsui/rom/wapisecuritysettingsui.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for project wapisecuritysettingsui
-*
-*/
-
-/*
-* %version: 9 %
-*/
-
-#ifndef __WAPISECURITYSETTINGSUI_IBY__
-#define __WAPISECURITYSETTINGSUI_IBY__
-
-#ifdef __PROTOCOL_WLAN
-#ifndef FF_WLAN_WAPI_INCLUDE_IN_ROM
-// Use stub implementation
-FILE=ABI_DIR\BUILD_DIR\wapisecuritysettingsui.dll		SHARED_LIB_DIR\wapisecuritysettingsui.dll
-#else
-// Use real implementation
-FILE=ABI_DIR\BUILD_DIR\realwapisecuritysettingsui.dll	SHARED_LIB_DIR\wapisecuritysettingsui.dll
-#endif // FF_WLAN_WAPI_INCLUDE_IN_ROM
-#endif // __PROTOCOL_WLAN
-
-#endif // #ifndef __WAPISECURITYSETTINGSUI_IBY__
--- a/wlansecuritysettings/wapisecuritysettingsui/rom/wapisecuritysettingsuiresources.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for project wapisecuritysettingsui
-*
-*/
-
-/*
-* %version: 3.1.4 %
-*/
-
-#ifndef __WAPISECURITYSETTINGSUIRESOURCES_IBY__
-#define __WAPISECURITYSETTINGSUIRESOURCES_IBY__
-
-#ifdef __PROTOCOL_WLAN
-DATA=DATAZ_\RESOURCE_FILES_DIR\wapisecuritysettingsui.rsc	RESOURCE_FILES_DIR\wapisecuritysettingsui.rsc
-#endif
-
-#endif
\ No newline at end of file
--- a/wlansecuritysettings/wapisecuritysettingsui/stub/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file provides the information required for building the wapisecuritysettings stub. 
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-// export iby files
-../../rom/wapisecuritysettingsui.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(wapisecuritysettingsui.iby)
-
-PRJ_MMPFILES
-./wapisecuritysettingsstub.mmp
-
-// End of File
--- a/wlansecuritysettings/wapisecuritysettingsui/stub/group/wapisecuritysettingsstub.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is project specification file for the wapisecuritysettings stub. 
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET      wapisecuritysettingsui.dll
-TARGETTYPE  DLL
-
-CAPABILITY CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../src
-
-SOURCE wapisecuritysettingsstub.cpp
-SOURCE wapisecuritysettingsuistub.cpp
-
-
-// Component specific internal headers 
-USERINCLUDE			../../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-//Used libraries
-LIBRARY euser.lib
-
-#if defined( WINSCW )
-DEFFILE ../../bwinscw/wapisecuritysettingsui.def
-#else
-DEFFILE ../../eabi/wapisecuritysettingsui.def
-#endif
-
-// End of File
--- a/wlansecuritysettings/wapisecuritysettingsui/stub/src/wapisecuritysettingsstub.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub Implementation of class CWAPISecuritySettings.     
-*
-*/
-
-/*
-* %version: 9 %
-*/
-
-// INCLUDE FILES
-#include <e32base.h>
-#include <wapisecuritysettingsui.h>
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWAPISecuritySettings::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CWAPISecuritySettings* CWAPISecuritySettings::NewL()
-    {
-    User::Leave(KErrNotSupported); 
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CWAPISecuritySettings::~CWAPISecuritySettings
-// ---------------------------------------------------------
-//
-EXPORT_C CWAPISecuritySettings::~CWAPISecuritySettings()
-    {
-   
-    }
-
-
-// ---------------------------------------------------------
-// CWAPISecuritySettings::EditL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWAPISecuritySettings::EditL( CWAPISecuritySettingsUi& /* aUi */,
-                                           const TDesC& /* aTitle */ )
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CWAPISecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWAPISecuritySettings::LoadL( TUint32 /* aIapRecordId */, CMDBSession& /* aSession  */)
-    {
-    
-    }
-    
-
-// ---------------------------------------------------------
-// CWAPISecuritySettings::IsValid
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CWAPISecuritySettings::IsValid( ) const
-
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CWAPISecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWAPISecuritySettings::SaveL( TUint32 /* aIapRecordId */, CMDBSession& /* aSession  */ ) const
-
-    {
-    
-    }
-
-
-// ---------------------------------------------------------
-// CWAPISecuritySettings::SetPreSharedKey
-// ---------------------------------------------------------
-//
-EXPORT_C void CWAPISecuritySettings::SetPreSharedKeyL( const TWapiKeyFormat /* aKeyFormat */, const TDesC& /* aPreSharedKey */ )
-    {
-    }
-	
-
-// ---------------------------------------------------------
-// CWAPISecuritySettings::DeleteAPSpecificDataL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWAPISecuritySettings::DeleteAPSpecificDataL( const TInt /* aId */)
-    {
-    
-    }
-
-// End of File
--- a/wlansecuritysettings/wapisecuritysettingsui/stub/src/wapisecuritysettingsuistub.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub implementation of class CWAPISecuritySettingsUi.  
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-// INCLUDE FILES
-#include <e32base.h>
-#include <wapisecuritysettingsui.h>
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWAPISecuritySettingsUi::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CWAPISecuritySettingsUi* CWAPISecuritySettingsUi::NewL( 
-                                                        CEikonEnv& /* aEikEnv */)
-    {
-    User::Leave(KErrNotSupported); 
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CWAPISecuritySettingsUi::~CWAPISecuritySettingsUi
-// ---------------------------------------------------------
-//
-EXPORT_C CWAPISecuritySettingsUi::~CWAPISecuritySettingsUi()
-    {
-    }
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/Rom/WEPSecuritySettingsUI.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for project WEPSecuritySettingsUI
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#ifndef __WEPSECURITYSETTINGSUI_IBY__
-#define __WEPSECURITYSETTINGSUI_IBY__
-
-#ifdef __PROTOCOL_WLAN
-FILE=ABI_DIR\BUILD_DIR\WEPSecuritySettingsUI.dll    SHARED_LIB_DIR\WEPSecuritySettingsUI.dll
-#else
-// stub for non-WLAN products
-FILE=ABI_DIR\BUILD_DIR\wepsecuritysettingsuistub.dll    SHARED_LIB_DIR\WEPSecuritySettingsUI.dll
-#endif // __PROTOCOL_WLAN
-
-#endif
--- a/wlansecuritysettings/wepsecuritysettingsui/Rom/WEPSecuritySettingsUIResources.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for project WEPSecuritySettingsUI
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#ifndef __WEPSECURITYSETTINGSUIRESOURCES_IBY__
-#define __WEPSECURITYSETTINGSUIRESOURCES_IBY__
-
-#ifdef __PROTOCOL_WLAN
-DATA=DATAZ_\RESOURCE_FILES_DIR\WEPSecuritySettingsUI.rsc	RESOURCE_FILES_DIR\WEPSecuritySettingsUI.rsc
-#endif  // __PROTOCOL_WLAN
-
-#endif
\ No newline at end of file
--- a/wlansecuritysettings/wepsecuritysettingsui/bwinscw/WEPSecuritySettingsUI_EKA2_ALRu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-EXPORTS
-	??1CWEPSecuritySettings@@UAE@XZ @ 1 NONAME ; CWEPSecuritySettings::~CWEPSecuritySettings(void)
-	??1CWEPSecuritySettingsUi@@UAE@XZ @ 2 NONAME ; CWEPSecuritySettingsUi::~CWEPSecuritySettingsUi(void)
-	?Cvt@CWEPSecuritySettingsUi@@SAHXZ @ 3 NONAME ; int CWEPSecuritySettingsUi::Cvt(void)
-	?EditL@CWEPSecuritySettings@@QAEHAAVCWEPSecuritySettingsUi@@ABVTDesC16@@@Z @ 4 NONAME ; int CWEPSecuritySettings::EditL(class CWEPSecuritySettingsUi &, class TDesC16 const &)
-	?LoadL@CWEPSecuritySettings@@QAEXKAAVCCommsDatabase@@@Z @ 5 NONAME ; void CWEPSecuritySettings::LoadL(unsigned long, class CCommsDatabase &)
-	?NewL@CWEPSecuritySettings@@SAPAV1@XZ @ 6 NONAME ; class CWEPSecuritySettings * CWEPSecuritySettings::NewL(void)
-	?NewL@CWEPSecuritySettingsUi@@SAPAV1@AAVCEikonEnv@@@Z @ 7 NONAME ; class CWEPSecuritySettingsUi * CWEPSecuritySettingsUi::NewL(class CEikonEnv &)
-	?SaveL@CWEPSecuritySettings@@QBEXKAAVCCommsDatabase@@@Z @ 8 NONAME ; void CWEPSecuritySettings::SaveL(unsigned long, class CCommsDatabase &) const
-	?IsValid@CWEPSecuritySettings@@QBEHXZ @ 9 NONAME ; int CWEPSecuritySettings::IsValid(void) const
-	?SetKeyDataL@CWEPSecuritySettings@@QAEHHABVTDesC16@@H@Z @ 10 NONAME ; int CWEPSecuritySettings::SetKeyDataL(int, class TDesC16 const &, int)
-	?LoadL@CWEPSecuritySettings@@QAEXKAAVCMDBSession@CommsDat@@@Z @ 11 NONAME ; void CWEPSecuritySettings::LoadL(unsigned long, class CommsDat::CMDBSession &)
-	?SaveL@CWEPSecuritySettings@@QBEXKAAVCMDBSession@CommsDat@@@Z @ 12 NONAME ; void CWEPSecuritySettings::SaveL(unsigned long, class CommsDat::CMDBSession &) const
-	?SetAuthentication@CWEPSecuritySettings@@QAEXW4TWEPAuthentication@1@@Z @ 13 NONAME ; void CWEPSecuritySettings::SetAuthentication(enum CWEPSecuritySettings::TWEPAuthentication)
-	?SetKeyInUse@CWEPSecuritySettings@@QAEXW4TWEPKeyInUse@1@@Z @ 14 NONAME ; void CWEPSecuritySettings::SetKeyInUse(enum CWEPSecuritySettings::TWEPKeyInUse)
-
--- a/wlansecuritysettings/wepsecuritysettingsui/data/WEPSecuritySettingsUI.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,390 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file contains all the resources for the WEP Security Settings UI. 
-*
-*/
-
-/*
-* %version: tr1cfwln#7.1.11 %
-*/
-
-//  RESOURCE IDENTIFIER
-NAME    AWSS // 4 letter ID
-
-//  INCLUDES
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.loc>
-#include <avkon.hrh>
-
-#include "WEPSecuritySettingsUI.hrh"
-#include <wepsecuritysettingsui.loc>
-
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf="WEPSecuritySettings"; }
-
-
-//----------------------------------------------------
-//
-//  r_wep_security_settings_menubar
-//  Menubar    
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_wep_security_settings_menubar
-    {
-    titles=
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_wep_security_settings_menu;
-            }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//  r_wep_security_settings_menu
-//  The Options menu
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_wep_security_settings_menu
-    {
-    items=
-        {
-        MENU_ITEM 
-            { 
-            command = EWepSelCmdChange; 
-            txt = qtn_set_options_change; 
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt = qtn_options_help; 
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdExit; 
-            txt = qtn_options_exit; 
-            }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//    r_wepsettings_pane_softkeys_options_back_edit
-//    WEP Security Settings softkeys
-//
-//----------------------------------------------------
-//
-RESOURCE CBA r_wepsettings_pane_softkeys_options_back_edit
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EWepSelCmdChange; txt = qtn_msk_change; }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//  r_wepsettings_dialog
-//  WEP Security Settings main dialog
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_wepsettings_dialog
-    {
-    flags = EEikDialogFlagWait | EEikDialogFlagNoDrag | 
-            EEikDialogFlagNoTitleBar | EEikDialogFlagFillAppClientRect |
-            EEikDialogFlagCbaButtons;
-
-    buttons = r_wepsettings_pane_softkeys_options_back_edit;
-
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtSettingListBox;
-            id = KWepMainSettingsListboxId;
-            control = LISTBOX 
-                { 
-                flags = EAknListBoxSelectionList;
-                };
-            }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//   
-//  r_setting_app_edwin_key_data
-//  Window to enter key data
-//
-//----------------------------------------------------
-//
-RESOURCE EDWIN r_setting_app_edwin_key_data
-    {
-    avkon_flags = EAknEditorFlagNoT9 | EAknEditorFlagLatinInputModesOnly;
-    lines = 8;
-    }
-
-
-//----------------------------------------------------
-//   
-//  r_text_setting_page_key_data
-//  Setting page for entering key data
-//
-//----------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_key_data
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    number= EAknSettingPageNoOrdinalDisplayed;
-    label= qtn_wlan_sett_wep_key_data;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_key_data;
-    }
-
-
-
-//----------------------------------------------------
-//   
-//  r_setting_app_listbox
-//  Listbox for setting page
-//
-//----------------------------------------------------
-//
-RESOURCE LISTBOX r_setting_app_listbox
-    {
-    flags = EEikListBoxMultipleSelection;
-    }
-
-
-
-//----------------------------------------------------
-//
-//    r_wepsettings_pane_softkeys_ok_cancel_select
-//    WEP Security Settings softkeys
-//
-//----------------------------------------------------
-//
-RESOURCE CBA r_wepsettings_pane_softkeys_ok_cancel_select
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = text_softkey_ok; },
-        CBA_BUTTON { id = EAknSoftkeyCancel; txt = text_softkey_cancel; },
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = qtn_msk_select; }
-        };
-    }
-
-
-//----------------------------------------------------
-//   
-//  r_radio_button_setting_page
-//  Setting page with radio buttons
-//
-//----------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_radio_button_setting_page
-    {
-    number = EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = r_wepsettings_pane_softkeys_ok_cancel_select;
-    type =  EAknSetListBox;
-    editor_resource_id= r_setting_app_listbox;
-    }
-
-
-
-//----------------------------------------------------
-//   
-//    r_wep_sec_sett_conf_query
-//    ConfirmationQuery dialog
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_wep_sec_sett_conf_query
-	{
-	flags = EGeneralQueryFlags;
-	buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-	items =
-		{
-		DLG_LINE
-			{
-			type = EAknCtQuery;
-			id = EGeneralQuery;
-			control = AVKON_CONFIRMATION_QUERY
-				{
-				layout = EConfirmationQueryLayout;
-				};
-			}
-		};
-	}
-
-
-
-RESOURCE TBUF r_wep_view_text_cannot_access_db      
-    { 
-    buf = qtn_set_err_db_inaccessible; 
-    }
-
-RESOURCE TBUF r_wep_key_in_use                      
-    { 
-    buf = qtn_wlan_sett_wep_key_in_use; 
-    }
-
-RESOURCE TBUF r_wep_authentication                  
-    { 
-    buf = qtn_wlan_sett_wep_auth_mode; 
-    }
-
-RESOURCE TBUF r_wep_key_configuration               
-    { 
-    buf = qtn_wlan_sett_wep_key_settings; 
-    }
-
-RESOURCE TBUF r_wep_key_number_1                    
-    { 
-    buf = qtn_wlan_sett_wep_key_1; 
-    }
-
-RESOURCE TBUF r_wep_key_number_2                    
-    { 
-    buf = qtn_wlan_sett_wep_key_2; 
-    }
-
-RESOURCE TBUF r_wep_key_number_3                    
-    { 
-    buf = qtn_wlan_sett_wep_key_3; 
-    }
-
-RESOURCE TBUF r_wep_key_number_4                    
-    { 
-    buf = qtn_wlan_sett_wep_key_4; 
-    }
-    
-RESOURCE TBUF r_wep_tab_key_1
-    {
-    buf = qtn_wlan_tab_wep_key_1;
-    }
-    
-RESOURCE TBUF r_wep_tab_key_2
-    {
-    buf = qtn_wlan_tab_wep_key_2;
-    }
-    
-RESOURCE TBUF r_wep_tab_key_3
-    {
-    buf = qtn_wlan_tab_wep_key_3;
-    }
-    
-RESOURCE TBUF r_wep_tab_key_4
-    {
-    buf = qtn_wlan_tab_wep_key_4;
-    }
-
-RESOURCE TBUF r_wep_authentication_open             
-    { 
-    buf = qtn_wlan_sett_wep_auth_mode_open; 
-    }
-
-RESOURCE TBUF r_wep_authentication_shared           
-    { 
-    buf = qtn_wlan_sett_wep_auth_mode_shared; 
-    }
-
-RESOURCE TBUF r_wep_key_length                      
-    { 
-    buf = qtn_wlan_sett_wep_key_length; 
-    }
-
-RESOURCE TBUF r_wep_key_format                      
-    { 
-    buf = qtn_wlan_sett_wep_key_format; 
-    }
-
-RESOURCE TBUF r_wep_key_data                        
-    { 
-    buf = qtn_wlan_sett_wep_key_data; 
-    }
-
-RESOURCE TBUF r_wep_key_length_64_bits              
-    { 
-    buf = qtn_wlan_sett_wep_key_length_64_bits; 
-    }
-
-RESOURCE TBUF r_wep_key_length_128_bits
-    { 
-    buf = qtn_wlan_sett_wep_key_length_128_bits; 
-    }
-
-RESOURCE TBUF r_wep_key_length_256_bits             
-    { 
-    buf = qtn_wlan_sett_wep_key_length_256_bits; 
-    }
-
-RESOURCE TBUF r_wep_key_format_ascii                
-    { 
-    buf = qtn_wlan_sett_wep_key_format_ascii; 
-    }
-
-RESOURCE TBUF r_wep_key_format_hex                  
-    { 
-    buf = qtn_wlan_sett_wep_key_format_hexa; 
-    }
-
-RESOURCE TBUF r_wep_key_data_must_be_defined        
-    { 
-    buf = qtn_selec_setting_compulsory; 
-    }
-
-RESOURCE TBUF r_wep_key_data_stars                  
-    { 
-    buf = qtn_wlan_sett_wep_key_format_hexa; 
-    }
-
-RESOURCE TBUF r_wep_data_missing                    
-    { 
-    buf = qtn_wlan_quest_wep_key_data_missing; 
-    }
-
-RESOURCE TBUF r_info_wep_key_too_short              
-    { 
-    buf = qtn_wlan_info_wep_key_too_short; 
-    }
-
-RESOURCE TBUF r_info_wep_key_illegal_chars          
-    { 
-    buf = qtn_wlan_info_wep_key_illegal_chars; 
-    }
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/eabi/WEPSecuritySettingsUI_EKA2_ALRu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-EXPORTS
-	_ZN20CWEPSecuritySettings4NewLEv @ 1 NONAME
-	_ZN20CWEPSecuritySettings5EditLER22CWEPSecuritySettingsUiRK7TDesC16 @ 2 NONAME
-	_ZN20CWEPSecuritySettings5LoadLEmR14CCommsDatabase @ 3 NONAME
-	_ZN20CWEPSecuritySettingsD0Ev @ 4 NONAME
-	_ZN20CWEPSecuritySettingsD1Ev @ 5 NONAME
-	_ZN20CWEPSecuritySettingsD2Ev @ 6 NONAME
-	_ZN22CWEPSecuritySettingsUi3CvtEv @ 7 NONAME
-	_ZN22CWEPSecuritySettingsUi4NewLER9CEikonEnv @ 8 NONAME
-	_ZN22CWEPSecuritySettingsUiD0Ev @ 9 NONAME
-	_ZN22CWEPSecuritySettingsUiD1Ev @ 10 NONAME
-	_ZN22CWEPSecuritySettingsUiD2Ev @ 11 NONAME
-	_ZNK20CWEPSecuritySettings5SaveLEmR14CCommsDatabase @ 12 NONAME
-	_ZNK20CWEPSecuritySettings7IsValidEv @ 13 NONAME
-	_ZN20CWEPSecuritySettings11SetKeyDataLEiRK7TDesC16i @ 14 NONAME
-	_ZN20CWEPSecuritySettings5LoadLEmRN8CommsDat11CMDBSessionE @ 15 NONAME
-	_ZNK20CWEPSecuritySettings5SaveLEmRN8CommsDat11CMDBSessionE @ 16 NONAME
-	_ZN20CWEPSecuritySettings11SetKeyInUseENS_12TWEPKeyInUseE @ 17 NONAME
-	_ZN20CWEPSecuritySettings17SetAuthenticationENS_18TWEPAuthenticationE @ 18 NONAME
-
--- a/wlansecuritysettings/wepsecuritysettingsui/group/WEPSecuritySettingsUI.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is project specification file for the WEPSecuritySettingsUI. 
-*
-*/
-
-/*
-* %version: tr1cfwln#25 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET      WEPSecuritySettingsUI.dll
-TARGETTYPE  DLL
-
-CAPABILITY CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-
-START RESOURCE  ../data/WEPSecuritySettingsUI.rss
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END  // RESOURCE
-
-
-SOURCEPATH ../src
-
-SOURCE WEPSecuritySettings.cpp
-SOURCE WEPSecuritySettingsImpl.cpp
-SOURCE WEPSecuritySettingsUI.cpp
-SOURCE WEPSecuritySettingsUiImpl.cpp
-SOURCE WEPSecuritySettingsDlg.cpp
-SOURCE WepKeyDataTextSettingPage.cpp
-SOURCE WEPSecuritySettingsUiPanic.cpp
-
-// Component specific internal headers 
-USERINCLUDE			../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY hlplch.lib
-LIBRARY euser.lib
-LIBRARY cone.lib
-LIBRARY eikcore.lib
-LIBRARY eikcoctl.lib
-LIBRARY avkon.lib
-LIBRARY eikdlg.lib 
-LIBRARY bafl.lib
-LIBRARY commonengine.lib 
-LIBRARY commdb.lib
-LIBRARY FeatMgr.lib
-LIBRARY commsdat.lib
-
-DEBUGLIBRARY flogger.lib
-
-#if defined( WINSCW )
-    DEFFILE ../bwinscw/WEPSecuritySettingsUI_EKA2_ALR.def
-#else
-    DEFFILE ../eabi/WEPSecuritySettingsUI_EKA2_ALR.def
-#endif
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file provides the information required for building the whole of a WEPSecuritySettingsUI. 
-*
-*/
-
-/*
-* %version: tr1cfwln#22 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-// export iby files
-../Rom/WEPSecuritySettingsUI.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(WEPSecuritySettingsUI.iby)
-../Rom/WEPSecuritySettingsUIResources.iby	LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(WEPSecuritySettingsUIResources.iby)
-
-// export localised loc file
-../loc/wepsecuritysettingsui.loc	MW_LAYER_LOC_EXPORT_PATH(wepsecuritysettingsui.loc)
-
-
-PRJ_MMPFILES
-// real implementation for WLAN products
-./WEPSecuritySettingsUI.mmp
-// stub implementation for non-WLAN products
-./wepsecuritysettingsuistub.mmp
-
-PRJ_TESTMMPFILES
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/group/wepsecuritysettingsuistub.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Project specification file for stub implementation of 
-*              WEP UI for non-WLAN products to support linking
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET      wepsecuritysettingsuistub.dll
-TARGETTYPE  DLL
-
-CAPABILITY CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../src
-
-SOURCE wepsecuritysettingsstub.cpp
-SOURCE wepsecuritysettingsuistub.cpp
-
-// Component specific internal headers 
-USERINCLUDE			../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-
-#if defined( WINSCW )
-    DEFFILE ../bwinscw/WEPSecuritySettingsUI_EKA2_ALR.def
-#else
-    DEFFILE ../eabi/WEPSecuritySettingsUI_EKA2_ALR.def
-#endif
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/SecuritySettingsLogger.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Logger utility.
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef SECURITYSETTINGSLOGGER_H
-#define SECURITYSETTINGSLOGGER_H
-
-
-// INCLUDES
-
-#include <e32std.h>
-#include <e32def.h>
-#include <flogger.h>
-
-
-#ifdef _DEBUG
-#define __SEC_SETT_LOG__
-#endif // _DEBUG
-
-
-#ifdef __SEC_SETT_LOG__
-
-// CONSTANTS
-
-// SecuritySettingsLogger logging directory.
-_LIT( KSecSettLogDir,                   "TestSecSett" );
-// SecSett log file name.
-_LIT( KSecSettLogFile,                  "SecSett.log" );
-// Format string: enter function.
-_LIT( KSecSettLogEnterFn,               "-> %S" );
-// Format string: leave function.
-_LIT( KSecSettLogLeaveFn,               "<- %S" );
-// Format string: time.
-_LIT( KSecSettLogTimeFormatString,      "%H:%T:%S:%*C2" );
-// Format string: timestamp.
-_LIT( KSecSettLogTimeStampFormatString, "%S %S" );
-
-// DEFINES
-
-// Write log: enter function.
-#define CLOG_ENTERFN( a )           \
-    {                               \
-    _LIT( temp, a );                \
-    RFileLogger::WriteFormat        \
-        (                           \
-        KSecSettLogDir,             \
-        KSecSettLogFile,            \
-        EFileLoggingModeAppend,     \
-        KSecSettLogEnterFn,         \
-        &temp                       \
-        );                          \
-    }
-
-// Write log: leave function.
-#define CLOG_LEAVEFN( a )           \
-    {                               \
-    _LIT( temp, a );                \
-    RFileLogger::WriteFormat        \
-        (                           \
-        KSecSettLogDir,             \
-        KSecSettLogFile,            \
-        EFileLoggingModeAppend,     \
-        KSecSettLogLeaveFn,         \
-        &temp                       \
-        );                          \
-    }
-
-// Write log: string 'a'.
-#define CLOG_WRITE( a )             \
-    {                               \
-    _LIT( temp, a );                \
-    RFileLogger::Write              \
-        (                           \
-        KSecSettLogDir,             \
-        KSecSettLogFile,            \
-        EFileLoggingModeAppend,     \
-        temp                        \
-        );                          \
-    }
-
-// Write log: formatted.
-#define CLOG_WRITE_FORMAT( a, b )   \
-    {                               \
-    _LIT( temp, a );                \
-    RFileLogger::WriteFormat        \
-        (                           \
-        KSecSettLogDir,             \
-        KSecSettLogFile,            \
-        EFileLoggingModeAppend,     \
-        temp,                       \
-        b                           \
-        );                          \
-    }
-
-// Write log: timestamp.
-#define CLOG_WRITE_TIMESTAMP( a )                                   \
-    {                                                               \
-    _LIT( temp, a );                                                \
-    TTime time;                                                     \
-    time.HomeTime();                                                \
-    TBuf<32> timeBuf;                                               \
-    TRAPD( err, time.FormatL( timeBuf, KSecSettLogTimeFormatString ) ); \
-    if ( !err )                                                     \
-        {                                                           \
-        RFileLogger::WriteFormat                                    \
-            (                                                       \
-            KSecSettLogDir,                                         \
-            KSecSettLogFile,                                        \
-            EFileLoggingModeAppend,                                 \
-            KSecSettLogTimeStampFormatString,                       \
-            &temp,                                                  \
-            &timeBuf                                                \
-            );                                                      \
-        }                                                           \
-    }
-
-#else // not defined __SEC_SETT_LOG__
-
-// DEFINES
-
-// Empty definition (disable log).
-#define CLOG_ENTERFN( a )
-
-// Empty definition (disable log).
-#define CLOG_LEAVEFN( a )
-
-// Empty definition (disable log).
-#define CLOG_WRITE( a )
-
-// Empty definition (disable log).
-#define CLOG_WRITE_FORMAT( a, b )
-
-// Empty definition (disable log).
-#define CLOG_WRITE_TIMESTAMP( a )
-
-#endif // __SEC_SETT_LOG__
-
-#endif 
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsDlg.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,318 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares dialog. 
-*
-*/
-
-/*
-* %version: tr1cfwln#14 %
-*/
-
-#ifndef WEP_SECURITY_SETTINGS_DLG_H
-#define WEP_SECURITY_SETTINGS_DLG_H
-
-
-// INCLUDES
-#include <eiklbo.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include <AknTabObserver.h>
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <commsdat.h>
-#else
-#include <commsdat.h>
-#include <commsdat_partner.h>
-#endif
-
-#include "WepSecuritySettingsDefs.h"
-
-
-// FORWARD DECLARATIONS
-class CAknTitlePane;
-class CAknNavigationControlContainer;
-class CAknNavigationDecorator;
-class CAknTabGroup;
-
-
-// CLASS DECLARATION
-/**
-* CWEPSecuritySettingsDlg dialog class
-*/
-NONSHARABLE_CLASS( CWEPSecuritySettingsDlg ) : public CAknDialog, 
-                                               public MEikListBoxObserver,
-                                               public MAknTabObserver
-    {
-
-    public: // Constructors and destructor
-
-        /**
-        * Create and launch dialog.
-        * @param aSecuritySettings Security settings
-        * @param aTitle Title of the dialog
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( CWEPSecuritySettingsImpl* aSecuritySettings,
-                                const TDesC& aTitle );
-
-
-        /**
-        * Two-phase construction.
-        * @param aEventStore A reference to hold the events happened
-        * @return The constructed CWEPSecuritySettingsDlg object.
-        */
-        static CWEPSecuritySettingsDlg* NewL( TInt& aEventStore );
-
-
-        /**
-        * Destructor.
-        */
-        ~CWEPSecuritySettingsDlg();
-
-
-	protected:
-        /**
-        * Constructor.
-        * @param aEventStore A reference to hold the events happened
-        */
-        CWEPSecuritySettingsDlg( TInt& aEventStore );
-
-
-    public: // Functions from base classes
-        /**
-        * Handle key events. 
-        * @param aKeyEvent: key event
-        * @param aType: type of event
-        * @return The key response, if it was consumed or not. 
-        */
-		TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                     TEventCode aType );
-
-
-    public: // From MAknTabObserver
-
-        /**
-        * Called when a key is tab change happens.
-        * @param aIndex index of the new tab
-        */
-        void TabChangedL( TInt aIndex ); 
-
-
-	private:
-
-        /**
-        * This function is called by the dialog framework before the dialog is 
-        * sized and laid out.
-        */
-        virtual void PreLayoutDynInitL();
-
-
-        /**
-        * Handles a dialog button press for the specified button 
-        * @param aButtonId  The ID of the button that was activated.
-        * @return   ETrue to validate and exit the dialog, 
-        *           EFalse to keep the dialog active
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-
-		/**
-        * Processes user commands.
-        * @param aCommandId ID of the command to respond to. 
-        */
-		virtual void ProcessCommandL( TInt aCommandId );
-
-
-		/**
-        * Handles list box events.
-        * @param aListBox   The originating list box. 
-        * @param aEventType A code for the event.
-        */
-		void HandleListBoxEventL( CEikListBox* aListBox, 
-                                  TListBoxEvent aEventType );
-
-        /**
-        * Get help context.
-        * @param aContext Help context is returned here.
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-
-    protected:  // New functions
-
-        /**
-        * Handles listbox data change
-        */
-        void HandleListboxDataChangeL();
-
-
-        /**
-        * Fills up the listbox with data
-        * @param aItemArray Array where to add the elements
-        * @param arr        Array to be used as list elements
-        * @param aLength    The number of elements in the above array
-        * @param aRes       Array of resource IDs to be used for the 
-        *                   elements of arr
-        */
-        void FillListWithDataL( CDesCArrayFlat& aItemArray, 
-                                const CWEPSecuritySettings::TWepMember& arr, 
-                                TInt aLength,
-                                const TInt* aRes );
-
-
-        /**
-        * Updates one listbox item for the given member
-        * @param aMember    Value specifying which member has to be added to 
-        *                   the list
-        * @param aRes       Resource ID for the 'title text' for this member
-        * @param aPos       The current position of the item in the list
-        */
-        void UpdateListBoxItemL( CWEPSecuritySettings::TWepMember aMember, 
-                                 TInt aRes, TInt aPos );
-
-
-        /**
-        * Creates one 'textual' listbox item for the given member
-        * @param aMember    Value specifying which member has to be added to
-        *                   the list
-        * @param aRes       Resource ID for the 'title text' for this member
-        * @return The created listbox item text.
-        */
-        HBufC* CreateTextualListBoxItemL( CWEPSecuritySettings::TWepMember aMember, 
-                                          TInt aRes );
-
-
-        /**
-        * Changes one setting. The setting, which is
-        * highlighted as current in the listbox is changed.
-        * @param aQuick ETrue if the setting is "two-choices", and can be 
-        *               automatically changed, without showing the list of 
-        *               elements
-        */
-        void ChangeSettingsL( TBool aQuick );
-
-
-        /**
-        * Shows a popup setting page (radio buttons) for the given member
-        * @param aDataMember    The member which needs to be changed
-        * @return   A boolean indicating whether the current setting
-        *           has been changed or not.
-        */
-        TBool   ShowPopupSettingPageL( 
-                                CWEPSecuritySettings::TWepMember aDataMember );
-
-
-        /**
-        * Shows a popup text setting page for the given member
-        * @return   A boolean indicating whether the current setting
-        *           has been changed or not.
-        */
-        TBool ShowPopupTextSettingPageL();
-
-
-        /**
-        * Fills up a pop-up radio button setting page with the currently
-        * valid and available choices for the given member.
-        * @param aData      The member whose new setting is needed
-        * @param aCurrvalue The current value of the setting
-        * @return   An array of choices for the given member, pushed to the 
-        *           CleanupStack.
-        */
-        CDesCArrayFlat* FillPopupSettingPageLC( 
-                                        CWEPSecuritySettings::TWepMember aData,
-                                        TInt& aCurrvalue );
-
-
-        /**
-        * Updates the given member's data with the new setting from the setting
-        * page.
-        * @param aData      The member to update
-        * @param aCurrvalue The new value
-        * @return   A boolean indicating if the value is actually changed
-        */
-        TBool UpdateFromPopupSettingPage( CWEPSecuritySettings::TWepMember aData, 
-                                          TInt aCurrvalue );
-
-
-        /**
-        * Inverts one boolean member 
-        * @param aDataMember the member to invert.
-        */
-        void InvertSettings( CWEPSecuritySettings::TWepMember aDataMember );
-
-
-    private: //data
-
-        // Stores the name of the connection, to be showed as the title.
-      	TBuf<CommsDat::KMaxTextLength> iConnectionName;
-
-        // Title pane. Not owned.
-        CAknTitlePane* iTitlePane;
-
-        // Pointer to the old title. Owned.
-        HBufC* iOldTitleText;
-
-        // Empty Navigation decorator. Owned.
-        CAknNavigationDecorator* iNaviDecoratorEmpty;
-
-        // Tabbed Navigation decorator. Owned.
-        CAknNavigationDecorator* iNaviDecoratorTabbed;
-
-        // Navi Pane. Not owned.
-        CAknNavigationControlContainer* iNaviPane;
-
-        // Tab Group. Not owned.
-        CAknTabGroup* iTabGroup;
-
-        // Index of the active tab
-        TInt iActiveTab;
-
-        // Owned through resources, destroyed automatically by the dialog.
-        CAknSettingStyleListBox* iList;
-
-        // Array of the items. Not owned.
-        CDesCArrayFlat* iItemArray;
-
-        // Fields of the main view. Not owned.
-        CWEPSecuritySettings::TWepMember* iFieldsMain;
-
-        // Titles of the main view. Not owned.
-        TInt* iTitlesMain;
-
-        // Fields of the key configuration view. Not owned.
-        CWEPSecuritySettings::TWepMember* iFieldsKeyConfiguration;
-
-        // Titles of the key configuration view. Not owned.
-        TInt* iTitlesKeyConfiguration;
-
-        // Pointer to the WEP Security Settings. Not owned.
-        CWEPSecuritySettingsImpl* iSecuritySettings;
-
-        // current level (main or key configuration)
-        TInt iLevel;
-
-        // To hold the events. Not owned.
-        TInt* iEventStore;
-    };
-
-
-#endif      // WEP_SECURITY_SETTINGS_DLG_H
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsImpl.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class CWEPSecuritySettingsImpl.  
-*
-*/
-
-/*
-* %version: tr1cfwln#19 %
-*/
-
-#ifndef WEPSECURITYSETTINGSIMPL_H
-#define WEPSECURITYSETTINGSIMPL_H
-
-// INCLUDES
-#include <e32base.h>
-
-#include <WEPSecuritySettingsUI.h>
-#include "WepSecuritySettingsDefs.h"
-
-#include <metadatabase.h>
-using namespace CommsDat;
-
-// FORWARD DECLARATIONS
-
-class CCommsDatabase;
-
-
-// CLASS DECLARATION
-
-/**
-* WEP Security Settings.
-* Implementation behind proxy class CWEPSecuritySettings.
-*/
-NONSHARABLE_CLASS( CWEPSecuritySettingsImpl ) : public CBase
-    {
-
-    public:     // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @return The constructed CWEPSecuritySettings object.
-        */
-        static CWEPSecuritySettingsImpl* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CWEPSecuritySettingsImpl();
-
-    protected:  // Constructors
-
-        /**
-        * Constructor.
-        * @param aEikEnv Eikon environment.
-        */
-        CWEPSecuritySettingsImpl();
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-
-    public:     // New methods
-
-        /**
-        * Load from database.
-        * @param aIapId Wlan Service Table Id of the IAP to be loaded
-        * @param aCommsDb Comms database.
-        */
-        void LoadL( TUint32 aIapId, CCommsDatabase& aCommsDb );
-
-        /**
-        * Save to database.
-        * @param aIapId Wlan Service Table Id of the IAP to be saved
-        * @param aCommsDb Comms database.
-        */
-        void SaveL( TUint32 aIapId, CCommsDatabase& aCommsDb ) const;
-
-        /**
-        * Tells if the settings are valid and can be saved
-        * @return ETrue if all the compulsory settings have been entered
-        */
-        TBool IsValid();
-
-
-        /**
-        * Sets the new data of the key
-        * @param aElement   Index of the element whose data has to be set.
-        * @param aKeyData   The new value for data of the key.
-        * @param aHex       ETrue if data is in Ascii format
-        */
-        TInt SetKeyDataL( const TInt aElement, const TDesC& aKeyData, 
-                          const TBool aHex );
-
-
-        /**
-        * Calculates expected length of hex string of keyData on the base of
-        * the selected key length.
-        * @param aKeyLength Chosen key length
-        * @return   Expected length
-        */
-        TInt ExpectedLengthOfKeyData( CWEPSecuritySettings::TWEPKeyLength 
-                                                                  aKeyLength );
-
-
-        /**
-        * Gets Key currently in use
-        * @return The key in use.
-        */
-        inline CWEPSecuritySettings::TWEPKeyInUse KeyInUse () const;
-
-        /**
-        * Sets Key currently in use
-        * @param aKeyInUse  The new value for key in use.
-        */
-        inline void SetKeyInUse ( const CWEPSecuritySettings::TWEPKeyInUse 
-                                                                   aKeyInUse );
-
-
-        /**
-        * Gets type of Authentication
-        * @return The type of Authentication.
-        */
-        inline CWEPSecuritySettings::TWEPAuthentication Authentication () const;
-
-        /**
-        * Sets type of Authentication
-        * @param aAuthentication    The new value for type of Authentication.
-        */
-        inline void SetAuthentication( 
-              const CWEPSecuritySettings::TWEPAuthentication aAuthentication );
-
-
-        /**
-        * Gets the length of the key
-        * @param aElement   Index of the element whose length has to be 
-        *                   retrieved.
-        * @return The length of the key
-        */
-        inline CWEPSecuritySettings::TWEPKeyLength KeyLength ( 
-                                                   const TInt aElement ) const;
-
-        /**
-        * Sets the length of the key
-        * @param aElement   Index of the element whose length has to be set.
-        * @param aKeyLength The new value for length of the key.
-        */
-        inline void SetKeyLength( const TInt aElement, 
-                        const CWEPSecuritySettings::TWEPKeyLength aKeyLength );
-
-
-        /**
-        * Gets the format of the key
-        * @param aElement   Index of the element whose format has to be 
-        *                   retrieved.
-        * @return The format of the key
-        */
-        inline CWEPSecuritySettings::TWEPKeyFormat KeyFormat( 
-                                                   const TInt aElement ) const;
-
-        /**
-        * Sets the format of the key
-        * @param aElement   Index of the element whose format has to be set.
-        * @param aKeyLength The new value for format of the key.
-        */
-        inline void SetKeyFormat( const TInt aElement, 
-                        const CWEPSecuritySettings::TWEPKeyFormat aKeyFormat );
-
-
-        /**
-        * Gets the key data
-        * @param aElement   Index of the element whose keyData has to be 
-        *                   retrieved.
-        * @return The data of the key
-        */
-        inline TDes8* KeyData( const TInt aElement );
-
-        /**
-        * Sets the new data of the key
-        * @param aElement   Index of the element whose data has to be set.
-        * @param aKeyLength The new value for data of the key.
-        */
-        inline void SetKeyData( const TInt aElement, const TDesC8& aKeyData );
-
-        /**
-        * Tells if the Wep256 feature is enabled or not
-        * @return ETrue if the flag is enabled
-        */
-        inline TBool WEP256Enabled() const;
-
-        /**
-        * Verify if the entered keyData is valid
-        * @param aTextToTest        The text to be verified
-        * @param aLengthOfKeyData   The expected length of the keyData
-        * @param aWEPKeyFormat      The format chosen to enter the keyData
-        * @return   KErrNone if the text is valid, or error code if not.
-        */
-        TInt VerifyKeyData( const TDesC8& aTextToTest, TInt aLengthOfKeyData,
-                            CWEPSecuritySettings::TWEPKeyFormat aWEPKeyFormat );
-
-        /**
-        * Converts keyData enetered in Ascii format to hex format
-        * @param aSource    Source string
-        * @param aDest      destination string
-        */
-        void ConvertAsciiToHex( const TDesC8& aSource, HBufC8*& aDest );
-        
-        /**
-        * Load from database.
-        * @param aIapId Wlan Service Table Id of the IAP to be loaded
-        * @param aSession CommsDat session.
-        */
-        void LoadL( TUint32 aIapId, CMDBSession& aSession );
-        
-        /**
-        * Save to database.
-        * @param aIapId Wlan Service Table Id of the IAP to be saved
-        * @param aSession CommsDat session.
-        */
-        void SaveL( TUint32 aIapId, CMDBSession& aSession ) const;
-
-
-    private:
-
-        /**
-        * Sets keyLength parsing data contained in iKeyData
-        * @param aIndex Index of the element whose length has to be calculated.
-        */
-        void SetLenKeyDataFromText( const TInt aIndex );
-
-
-    private:    // Data 
-
-        // Index of the key currently in use (EKeyNumber1, EKeyNumber2, 
-        // EKeyNumber3, EKeyNumber4
-        CWEPSecuritySettings::TWEPKeyInUse iKeyInUse;
-
-        // Type of authentication (EAuthOpen, EAuthShared)
-        CWEPSecuritySettings::TWEPAuthentication iAuthentication;
-
-        // Length of the key (E40Bits, E104Bits, E232Bits)
-        CWEPSecuritySettings::TWEPKeyLength iKeyLength[KMaxNumberofKeys];
-
-        // Format of the key (EAscii, EHexadecimal)
-        CWEPSecuritySettings::TWEPKeyFormat iKeyFormat[KMaxNumberofKeys];
-
-        // Data of the key
-        TBuf8<KMaxLengthOfKeyData> iKeyData[KMaxNumberofKeys];
-
-        // Tells if the Wep256 feature is enabled
-        TBool iIsWEP256Enabled;
-    };
-
-// Include inline functions
-#include "WEPSecuritySettingsImpl.inl"
-
-
-#endif 
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsImpl.inl	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: CWEPSecuritySettingsImpl inline functions
-*
-*/
-
-/*
-* %version: tr1cfwln#12 %
-*/
-
-#ifndef WEPSECURITYSETTINGSIMPL_INL
-#define WEPSECURITYSETTINGSIMPL_INL
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::KeyInUse
-// ---------------------------------------------------------
-//
-inline CWEPSecuritySettings::TWEPKeyInUse 
-                                     CWEPSecuritySettingsImpl::KeyInUse() const
-    { 
-    return iKeyInUse; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::Authentication
-// ---------------------------------------------------------
-//
-inline CWEPSecuritySettings::TWEPAuthentication 
-                               CWEPSecuritySettingsImpl::Authentication() const
-    { 
-    return iAuthentication; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::KeyLength
-// ---------------------------------------------------------
-//
-inline CWEPSecuritySettings::TWEPKeyLength 
-               CWEPSecuritySettingsImpl::KeyLength( const TInt aElement ) const
-    { 
-    return iKeyLength[aElement]; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::KeyFormat
-// ---------------------------------------------------------
-//
-inline CWEPSecuritySettings::TWEPKeyFormat 
-               CWEPSecuritySettingsImpl::KeyFormat( const TInt aElement ) const
-    { 
-    return iKeyFormat[aElement]; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::KeyData
-// ---------------------------------------------------------
-//
-inline TDes8* CWEPSecuritySettingsImpl::KeyData( const TInt aElement )
-    { 
-    return &iKeyData[aElement]; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SetKeyInUse
-// ---------------------------------------------------------
-//
-inline void CWEPSecuritySettingsImpl::SetKeyInUse( 
-                           const CWEPSecuritySettings::TWEPKeyInUse aKeyInUse )
-    { 
-    iKeyInUse = aKeyInUse; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SetAuthentication
-// ---------------------------------------------------------
-//
-inline void CWEPSecuritySettingsImpl::SetAuthentication( 
-               const CWEPSecuritySettings::TWEPAuthentication aAuthentication )
-    { 
-    iAuthentication = aAuthentication; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SetKeyLength
-// ---------------------------------------------------------
-//
-inline void CWEPSecuritySettingsImpl::SetKeyLength( const TInt aElement, 
-                         const CWEPSecuritySettings::TWEPKeyLength aKeyLength )
-    { 
-    iKeyLength[aElement] = aKeyLength; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SetKeyFormat
-// ---------------------------------------------------------
-//
-inline void CWEPSecuritySettingsImpl::SetKeyFormat( const TInt aElement, 
-                         const CWEPSecuritySettings::TWEPKeyFormat aKeyFormat )
-    { 
-    iKeyFormat[aElement] = aKeyFormat; 
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SetKeyData
-// ---------------------------------------------------------
-//
-inline void CWEPSecuritySettingsImpl::SetKeyData( const TInt aElement, 
-                                                  const TDesC8& aKeyData )
-    {
-    iKeyData[aElement] = aKeyData;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::WEP256Enabled
-// ---------------------------------------------------------
-//
-inline TBool CWEPSecuritySettingsImpl::WEP256Enabled() const
-    {
-    // WEP256 is deprecated.
-    return EFalse;
-    }
-
-
-#endif 
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsUI.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file contains declarations for resources of WEPSecuritySettingsUI. The file can be included in C++ or resource file. 
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef WEPSecuritySettingsUI_HRH
-#define WEPSecuritySettingsUI_HRH
-
-
-// Menu command IDs
-enum TWepSelectorMenuCommands
-    {
-    EWepSelCmdChange = 1357
-    };
-
-
-// dialog line IDs
-enum TWepSelectorDllDlgLineId 
-    {
-    KWepMainSettingsListboxId = 3 
-    };
-
-
-// IDs of the tabs
-enum TWepTabId
-    {
-    EWEPSecuritySettingsTab1 = 1,
-    EWEPSecuritySettingsTab2,
-    EWEPSecuritySettingsTab3,
-    EWEPSecuritySettingsTab4
-    };
-
- 
-#endif      //  WEPSecuritySettingsUI_HRH
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsUiImpl.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class CWEPSecuritySettingsUiImpl.  
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef WEPSECURITYSETTINGSUIIMPL_H
-#define WEPSECURITYSETTINGSUIIMPL_H
-
-// INCLUDES
-
-#include <e32base.h>
-
-
-// FORWARD DECLARATIONS
-
-class CEikonEnv;
-class CWEPSecuritySettings;
-class CWEPSecuritySettingsUiImpl;
-class CWEPSecuritySettingsImpl;
-
-
-// CLASS DECLARATION
-
-/**
-* WEP Security Settings UI implementation (behind proxy class
-* CWEPSecuritySettingsUi)
-*/
-NONSHARABLE_CLASS( CWEPSecuritySettingsUiImpl ) : public CBase
-    {
-
-    public:     // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aEikEnv Eikon environment.
-        * @return The constructed CWEPSecuritySettingsUiImpl object.
-        */
-        static CWEPSecuritySettingsUiImpl* NewL( CEikonEnv& aEikEnv );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CWEPSecuritySettingsUiImpl();
-
-    protected:  // Constructors
-
-        /**
-        * Constructor.
-        * @param aEikEnv Eikon environment.
-        */
-        CWEPSecuritySettingsUiImpl( CEikonEnv& aEikEnv );
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-
-    public:     // New methods
-
-        /**
-        * Edit the settings.
-        * @param aSettings Settings to edit.
-        * @param aTitle Title Pane text to display during edit.
-        * @return Exit code. Value from CWEPSecuritySettings::TEvent bits 
-        * combined.
-        */
-        TInt EditL( CWEPSecuritySettingsImpl& aSettings, const TDesC& aTitle );
-
-
-    private:    // Data 
-
-        // To hold the events
-        TInt        iEventStore;
-
-        // Resource file offset.
-        TInt        iResOffset; 
-        
-        // Eikon environment. Not owned.
-        CEikonEnv*  iEikEnv;        
-    };
-
-#endif 
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsUiPanic.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Panic function and codes.     
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef WEPSECURITYSETTINGSUIPANIC_H
-#define WEPSECURITYSETTINGSUIPANIC_H
-
-// TYPES
-
-/**
-* Panic reasons for WEP Security Settings UI.
-*/
-enum TWepSecuritySettingsPanicCodes
-	{
-    EUnknownCase,
-    ETableNotFound
-	};
-
-
-// FUNCTION DECLARATIONS
-
-/**
-* Panic the thread.
-* @param aReason Reason for the panic.
-*/
-void Panic( TWepSecuritySettingsPanicCodes aPanic );
-
-#endif
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WepKeyDataTextSettingPage.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class CWEPKeyDataTextSettingPage.
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#ifndef WEPKEYDATA_TEXT_SETTING_PAGE_H
-#define WEPKEYDATA_TEXT_SETTING_PAGE_H
-
-
-// INCLUDE FILES
-#include <akntextsettingpage.h>
-#include <WEPSecuritySettingsUI.h>
-#include "WepSecuritySettingsDefs.h"
-
-
-// CLASS DECLARATION
-
-/*
-* Setting page for KeyData text. Overrides standard CAknTextSettingPage
-* to set some parameters at runtime, according to the KeyFormat
-*/
-NONSHARABLE_CLASS( CWEPKeyDataTextSettingPage ) : public CAknTextSettingPage
-    {
-    public: // Constructors
-
-        /**
-        * Constructor.
-        * @param aText  Reference to text for editing
-        * @param aMaxLength Number of characters to be entered
-        * @param aWEPKeyFormat  Format of data (EAscii or EHexadecimal)
-        */
-	    CWEPKeyDataTextSettingPage( TDes& aText, TInt aMaxLength, 
-                           CWEPSecuritySettings::TWEPKeyFormat aWEPKeyFormat );
-	    
-        /**
-        * Constructs the setting page. Called by ExecuteLD
-        */
-        virtual void ConstructL();
-
-    private:
-
-        // Number of characters to be entered
-        TInt iLengthOfKeyData;   
-
-        // Format of data (EAscii or EHexadecimal)
-        CWEPSecuritySettings::TWEPKeyFormat iWEPKeyFormat;
-    };
-
-
-#endif
-
-// End of file
--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WepSecuritySettingsDefs.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Definitions. 
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#ifndef WEPSECURITYSETTINGSDEFS_H
-#define WEPSECURITYSETTINGSDEFS_H
-
-
-// CONSTANTS
-
-// Empty key
-LOCAL_D const TUint KKeyDataLengthEmpty = 0;
-
-// Number of characters for a 40 bits key
-LOCAL_D const TUint KKeyDataLength40Bits  = 10;
-
-// Number of characters for a 104 bits key
-LOCAL_D const TUint KKeyDataLength104Bits = 26;
-
-// Number of characters for a 232 bits key
-LOCAL_D const TUint KKeyDataLength232Bits = 58;
-
-// The maximum length of key data
-LOCAL_D const TUint KMaxLengthOfKeyData = KKeyDataLength232Bits;
-                                            
-// Number of keys
-LOCAL_D const TUint KMaxNumberofKeys = 4;
-
-// Invalid id
-LOCAL_D const TUint32 KUidNone = 0;
-
-
-// UID of application containing help texts (General Settings).
-LOCAL_D const TUid KWEPSecuritySettingsUiHelpMajor = { 0x100058EC };
-
-// Error code for invalid length of key data
-LOCAL_D const TInt KErrInvalidLength = 101;
-
-// Error code for key data containing invalid characters
-LOCAL_D const TInt KErrInvalidChar = 102;
-
-
-#endif  // WEPSECURITYSETTINGSDEFS_H
--- a/wlansecuritysettings/wepsecuritysettingsui/loc/wepsecuritysettingsui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is a localisation file for WEPSecuritySettingsUI A .loc file is the one and only place where the logical strings to be localised are defined. 
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:Command in options menu.
-//d:Exits WEP Security Settings.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.0
-//
-#define qtn_set_options_exit                    "Exit"
-
-
-//d:Command in options menu.
-//d:Modifies the currently selected item.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.0
-//
-#define qtn_set_options_change                  "Change"
-
-
-//d:Name of the first tab of four
-//l:tabs_4_active_pane_t1/opt1
-//w:
-//r:3.0
-//
-#define qtn_wlan_tab_wep_key_1                  "#1"
-
-
-//d:Name of the second tab of four
-//l:tabs_4_active_pane_t1/opt1
-//w:
-//r:3.0
-//
-#define qtn_wlan_tab_wep_key_2                  "#2"
-
-
-//d:Name of the third tab of four
-//l:tabs_4_active_pane_t1/opt1
-//w:
-//r:3.0
-//
-#define qtn_wlan_tab_wep_key_3                  "#3"
-
-
-//d:Name of the fourth tab of four
-//l:tabs_4_active_pane_t1/opt1
-//w:
-//r:3.0
-//
-#define qtn_wlan_tab_wep_key_4                  "#4"
-
-
-//d:Error note message: database is inaccessible.
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_set_err_db_inaccessible             "Cannot access\ndatabase.\nTry again later."
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_in_use            "WEP key in use"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_auth_mode             "Authentication type"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_settings          "WEP key settings"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_length            "WEP key length"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_format            "WEP key format"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_data              "WEP key data"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_in_use
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_1                 "#1"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_in_use
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_2                 "#2"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_in_use
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_3                 "#3"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_in_use
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_4                 "#4"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_auth_mode
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_auth_mode_open        "Open"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_auth_mode
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_auth_mode_shared      "Shared"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_length
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_length_64_bits    "64 bits"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_length
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_length_128_bits   "128 bits"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_length
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_length_256_bits   "256 bits"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_format
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_format_ascii      "ASCII"
-
-
-//d:List pane for the setting value item list qtn_wlan_sett_wep_key_format
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wep_key_format_hexa       "Hexadecimal"
-
-
-//d:Confirmation query text to ask the user if he wants to continue even if
-//d:qtn_wlan_sett_wep_key_data was not entered and therefore security settings
-//d:will not be saved.
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_quest_wep_key_data_missing     "WEP key data for the key in use is compulsory. Security settings will not be saved. Continue?"
-
-
-//d:Error note to be showed when invalid number of characters have been
-//d:entered for qtn_wlan_sett_wep_key_data editor.
-//d:%N is the number of characters that must be entered.
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_info_wep_key_too_short         "WEP key too short. Key must be exactly %N characters long"
-
-
-//d:Error note to be showed when invalid characters have been entered for
-//d:qtn_wlan_sett_wep_key_data editor
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_info_wep_key_illegal_chars     "Illegal characters in WEP key"
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettings.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWEPSecuritySettings.     
-*
-*/
-
-/*
-* %version: tr1cfwln#15 %
-*/
-
-// INCLUDE FILES
-
-#include <WEPSecuritySettingsUI.h>
-
-#include "WEPSecuritySettingsImpl.h"
-#include "WEPSecuritySettingsUiImpl.h"
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CWEPSecuritySettings* CWEPSecuritySettings::NewL()
-    {
-    CWEPSecuritySettings* settings = new ( ELeave ) CWEPSecuritySettings();
-    CleanupStack::PushL( settings );
-    settings->iImpl = CWEPSecuritySettingsImpl::NewL();
-    CleanupStack::Pop( settings ); 
-    return settings;    
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::~CWEPSecuritySettings
-// ---------------------------------------------------------
-//
-EXPORT_C CWEPSecuritySettings::~CWEPSecuritySettings()
-    {
-    delete iImpl;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::LoadL( TUint32 aIapId, 
-                                           CCommsDatabase& aCommsDb )
-    {
-    iImpl->LoadL( aIapId, aCommsDb );
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::SaveL( TUint32 aIapId, 
-                                           CCommsDatabase& aCommsDb ) const
-    {
-    iImpl->SaveL( aIapId, aCommsDb );
-    }
-    
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::EditL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWEPSecuritySettings::EditL( CWEPSecuritySettingsUi& aUi,
-                                           const TDesC& aTitle )
-    {
-    return aUi.iImpl->EditL( *iImpl, aTitle );
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::IsValid
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CWEPSecuritySettings::IsValid() const
-    {
-    return iImpl->IsValid();
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SetKeyDataL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWEPSecuritySettings::SetKeyDataL( const TInt aElement,
-                                                 const TDesC& aKeyData,
-                                                 const TBool aHex )
-    {
-    return iImpl->SetKeyDataL( aElement, aKeyData, aHex );
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::LoadL( TUint32 aIapId, 
-                                           CMDBSession& aSession )
-    {
-    iImpl->LoadL( aIapId, aSession );
-    }
-    
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::SaveL( TUint32 aIapId, 
-                                           CMDBSession& aSession ) const
-    {
-    iImpl->SaveL( aIapId, aSession );
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SetKeyInUse
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::SetKeyInUse( 
-                                      CWEPSecuritySettings::TWEPKeyInUse aKey )
-    {
-    iImpl->SetKeyInUse( aKey );
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SetAuthentication
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::SetAuthentication( 
-                     CWEPSecuritySettings::TWEPAuthentication aAuthentication )
-    {
-    iImpl->SetAuthentication( aAuthentication );
-    }
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsDlg.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1314 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of dialog.  
-*
-*/
-
-/*
-* %version: tr1cfwln#8.1.22.1.1 %
-*/
-
-// INCLUDE FILES
-#include <aknnavide.h>
-#include <akntitle.h>
-#include <aknradiobuttonsettingpage.h>
-#include <aknmfnesettingpage.h>
-#include <barsread.h>
-#include <akntabgrp.h>
-#include <StringLoader.h>
-#include <aknnotewrappers.h>
-#include <WEPSecuritySettingsUI.h>
-
-#include <WEPSecuritySettingsUI.rsg>
-
-#include "WEPSecuritySettingsImpl.h"
-#include "WEPSecuritySettingsUiPanic.h"
-#include "WEPSecuritySettingsDlg.h"
-#include "WepKeyDataTextSettingPage.h"
-
-#include "WEPSecuritySettingsUI.hrh"
-
-#include <hlplch.h>
-
-#include <featmgr.h>
-
-
-// CONSTANT DECLARATIONS
-
-// Number of fields of main view
-LOCAL_D const TInt KNumOfFieldsMain = 3;
-
-// Number of fields of key configuration view
-LOCAL_D const TInt KNumOfFieldsKeyConfiguration = 3;
-
-// Ratio of ascii and hex key sizes
-LOCAL_D const TInt KAsciiHexRatio = 2;
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::CWEPSecuritySettingsDlg
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsDlg::CWEPSecuritySettingsDlg( TInt& aEventStore )
-: iNaviPane( NULL ), 
-iTabGroup( NULL ),
-iActiveTab( 0 ),
-iLevel( 0 ),
-iEventStore( &aEventStore )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::~CWEPSecuritySettingsDlg
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsDlg::~CWEPSecuritySettingsDlg()
-    {
-    if ( iNaviDecoratorEmpty )
-        {
-        delete iNaviDecoratorEmpty;
-        }
-
-    if ( iNaviDecoratorTabbed )
-        {
-        delete iNaviDecoratorTabbed;
-        }
-
-    if ( iTitlePane )
-        {
-        // set old text back, if we have it...
-        if ( iOldTitleText )
-            {
-            TRAP_IGNORE( iTitlePane->SetTextL( *iOldTitleText ) );
-            delete iOldTitleText;
-            }
-        }
-     
-     FeatureManager::UnInitializeLib();
-     }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::NewL
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsDlg* CWEPSecuritySettingsDlg::NewL( TInt& aEventStore )
-    {
-    CWEPSecuritySettingsDlg* secSett = 
-                        new ( ELeave )CWEPSecuritySettingsDlg( aEventStore );
-    return secSett;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CWEPSecuritySettingsDlg::ConstructAndRunLD( 
-                                CWEPSecuritySettingsImpl* aSecuritySettings,
-                                const TDesC& aTitle )
-    {
-	CleanupStack::PushL( this );
-
-    const TInt Titles_Wep_Main[KNumOfFieldsMain] =
-        {
-        R_WEP_KEY_IN_USE,
-        R_WEP_AUTHENTICATION,
-        R_WEP_KEY_CONFIGURATION
-        };
-
-    const TInt Fields_Wep_Main[KNumOfFieldsMain] =
-        {
-        CWEPSecuritySettings::EWepKeyInUse,
-        CWEPSecuritySettings::EWepAuthentication,
-        CWEPSecuritySettings::EWepKeyConfiguration
-        };
-
-    const TInt Fields_Wep_Key_Configuration[KNumOfFieldsKeyConfiguration] =
-        {
-        CWEPSecuritySettings::EWepKeyLength,
-        CWEPSecuritySettings::EWepKeyFormat,
-        CWEPSecuritySettings::EWepKeyData
-        };
-
-    const TInt Titles_Wep_Key_Configuration[KNumOfFieldsKeyConfiguration] =
-        {
-        R_WEP_KEY_LENGTH,
-        R_WEP_KEY_FORMAT,
-        R_WEP_KEY_DATA
-        };
-
-    iSecuritySettings = aSecuritySettings;
-    iConnectionName = aTitle;
-
-    iFieldsMain = ( CWEPSecuritySettings::TWepMember* ) Fields_Wep_Main;
-    iTitlesMain = MUTABLE_CAST( TInt*, Titles_Wep_Main );
-
-    iFieldsKeyConfiguration = ( CWEPSecuritySettings::TWepMember* ) 
-                                                  Fields_Wep_Key_Configuration;
-    iTitlesKeyConfiguration = MUTABLE_CAST( TInt*, 
-                                                Titles_Wep_Key_Configuration );
-
-    FeatureManager::InitializeLibL();
-
-    ConstructL( R_WEP_SECURITY_SETTINGS_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-	
-    return ExecuteLD( R_WEPSETTINGS_DIALOG );
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::OkToExitL
-// ---------------------------------------------------------
-//
-TBool CWEPSecuritySettingsDlg::OkToExitL( TInt aButtonId )
-{
-    // Translate the button presses into commands for the appui & current
-    // view to handle
-    TBool retval( EFalse );
-    if ( aButtonId == EAknSoftkeyOptions )
-        {
-        DisplayMenuL();
-        }
-    else if ( aButtonId == EEikCmdExit )        // ShutDown requested
-        {
-        *iEventStore |= CWEPSecuritySettings::EShutDownReq;
-        retval = ETrue;
-        }
-    else if ( aButtonId == EAknSoftkeyBack || aButtonId == EAknCmdExit )
-        {
-        if ( iSecuritySettings->IsValid() )
-            {
-            *iEventStore |= CWEPSecuritySettings::EValid;
-            retval = ETrue;
-            }
-        else if ( aButtonId == EAknSoftkeyBack )
-            {
-            HBufC* stringHolder = StringLoader::LoadL( 
-                                        R_WEP_DATA_MISSING, iEikonEnv );
-            CleanupStack::PushL( stringHolder );
-
-            CAknQueryDialog *queryDialog = new (ELeave) CAknQueryDialog();
-
-            queryDialog->PrepareLC( R_WEP_SEC_SETT_CONF_QUERY );
-            queryDialog->SetPromptL( stringHolder->Des() );
-            if ( queryDialog->RunLD() )
-                {
-                retval = ETrue;
-                }
-            else
-                {
-                iActiveTab = iSecuritySettings->KeyInUse();
-                iTabGroup->SetActiveTabByIndex( iActiveTab );
-                HandleListboxDataChangeL();
-                }
-            CleanupStack::PopAndDestroy( stringHolder );   // stringHolder
-            }
-        else
-            {
-            retval = ETrue;
-            }
-
-        if ( aButtonId == EAknCmdExit )
-            {
-            *iEventStore |= CWEPSecuritySettings::EExitReq;
-            }
-        }
-    else if( aButtonId == EWepSelCmdChange )
-        {
-        ChangeSettingsL( ETrue );
-        retval = EFalse; // don't exit the dialog
-        }
-
-    return retval;
-}
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::OfferKeyEventL
-// ---------------------------------------------------------
-//
-TKeyResponse CWEPSecuritySettingsDlg::OfferKeyEventL( 
-                                const TKeyEvent& aKeyEvent, TEventCode aType )
-    {
-    TKeyResponse retval( EKeyWasNotConsumed );
-    TChar charCode( aKeyEvent.iCode );
-
-    // Only interested in standard key events
-    if ( aType == EEventKey )
-        {
-        // If a menu is showing offer key events to it.
-        if ( CAknDialog::MenuShowing() )
-            {
-            retval = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-            }
-        else
-            {
-            if ( iList )
-                {
-                // as list IS consuming, must handle because it IS the SHUTDOWN...
-                // or, a view switch is shutting us down...
-                if ( aKeyEvent.iCode == EKeyEscape )
-                    {
-                    ProcessCommandL( EEikCmdExit );
-                    retval = EKeyWasConsumed;
-                    }
-                else if ( iLevel && ( charCode == EKeyLeftArrow || 
-                                      charCode == EKeyRightArrow ) )
-                    {
-                    if ( iTabGroup )
-                        {
-                        return iTabGroup->OfferKeyEventL( aKeyEvent, aType );
-                        }
-                    }
-                else
-                    {
-                    retval = iList->OfferKeyEventL( aKeyEvent, aType );
-                    }
-                }
-            else
-                {
-                if ( aKeyEvent.iCode == EKeyOK )
-                    {
-                    ProcessCommandL( EWepSelCmdChange );
-                    retval = EKeyWasConsumed;
-                    }
-                }
-            }
-        }
-
-    return retval;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::HandleListboxDataChangeL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::HandleListboxDataChangeL()
-    {
-    // fill up our new list with data
-    CDesCArrayFlat* itemArray = new ( ELeave ) CDesCArrayFlat( 4 );
-    CleanupStack::PushL( itemArray );
-
-    if ( iLevel )
-        {
-        FillListWithDataL( *itemArray, *iFieldsKeyConfiguration,
-                           KNumOfFieldsKeyConfiguration,
-                           iTitlesKeyConfiguration );
-
-        iNaviPane->ReplaceL( *iNaviDecoratorEmpty, *iNaviDecoratorTabbed );
-        }
-    else
-        {
-        FillListWithDataL( *itemArray, *iFieldsMain, KNumOfFieldsMain, 
-                           iTitlesMain );
-        iNaviPane->ReplaceL( *iNaviDecoratorTabbed, *iNaviDecoratorEmpty );
-        }
-
-    iList->Model()->SetItemTextArray( itemArray );
-    
-    CleanupStack::Pop( itemArray ); // now it is owned by the LB, so pop it
-    iItemArray = itemArray;
-
-    iList->HandleItemAdditionL();
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::ProcessCommandL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::ProcessCommandL( TInt aCommandId )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    switch ( aCommandId )
-        {
-        case EWepSelCmdChange:
-            {
-            ChangeSettingsL( EFalse );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-        case EEikCmdExit:
-            {
-            TryExitL( aCommandId );
-            break;
-            }
-
-        default:
-            {
-            // silently ignore it
-            break;
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                   TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-            // both handled in the same way for now...
-        case EEventItemSingleClicked:
-            {
-            ChangeSettingsL( ETrue );
-            break;
-            }
-
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EUnknownCase ) );
-            break;
-            };
-        };
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::PreLayoutDynInitL()
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::PreLayoutDynInitL()
-    {
-    // first get StatusPane
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-
-    // then get TitlePane
-    iTitlePane = ( CAknTitlePane* ) statusPane->ControlL( TUid::Uid( 
-                                                    EEikStatusPaneUidTitle ) );
-    // if not already stored, store it for restoring
-    if ( !iOldTitleText )
-        {
-        iOldTitleText = iTitlePane->Text()->AllocL();
-        }
-
-    // set new titlepane text
-    iTitlePane->SetTextL( iConnectionName );
-
-    // Fetch pointer to the default navi pane control
-    iNaviPane = ( CAknNavigationControlContainer* ) 
-                    statusPane->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) );
-
-    _LIT( KEmpty, "" );
-    if ( !iNaviDecoratorEmpty )
-        {
-        iNaviDecoratorEmpty = iNaviPane->CreateNavigationLabelL( KEmpty );
-        }
-
-    if ( !iNaviDecoratorTabbed )
-        {
-        iNaviDecoratorTabbed = iNaviPane->CreateTabGroupL();
-        
-        if (iNaviDecoratorTabbed)
-            {
-            iTabGroup = static_cast< CAknTabGroup* >
-                                    ( iNaviDecoratorTabbed->DecoratedControl() );
-            
-            HBufC16* tabText = iEikonEnv->AllocReadResourceLC( R_WEP_TAB_KEY_1 );
-            TPtr localizedTabText( tabText->Des() );
-            AknTextUtils::LanguageSpecificNumberConversion( localizedTabText );
-            iTabGroup->AddTabL( EWEPSecuritySettingsTab1, *tabText );
-            CleanupStack::PopAndDestroy( tabText ); // tabText
-            
-            tabText = iEikonEnv->AllocReadResourceLC( R_WEP_TAB_KEY_2 );
-            localizedTabText.Set( tabText->Des() );
-            AknTextUtils::LanguageSpecificNumberConversion( localizedTabText );
-            iTabGroup->AddTabL( EWEPSecuritySettingsTab2, *tabText );
-            CleanupStack::PopAndDestroy( tabText ); // tabText
-            
-            tabText = iEikonEnv->AllocReadResourceLC( R_WEP_TAB_KEY_3 );
-            localizedTabText.Set( tabText->Des() );
-            AknTextUtils::LanguageSpecificNumberConversion( localizedTabText );
-            iTabGroup->AddTabL( EWEPSecuritySettingsTab3, *tabText );
-            CleanupStack::PopAndDestroy( tabText ); // tabText
-            
-            tabText = iEikonEnv->AllocReadResourceLC( R_WEP_TAB_KEY_4 );
-            localizedTabText.Set( tabText->Des() );
-            AknTextUtils::LanguageSpecificNumberConversion( localizedTabText );
-            iTabGroup->AddTabL( EWEPSecuritySettingsTab4, *tabText );
-            CleanupStack::PopAndDestroy( tabText ); // tabText
-            
-            iTabGroup->SetTabFixedWidthL( EAknTabWidthWithFourTabs );
-            iTabGroup->SetActiveTabByIndex( 0 );
-                
-            iTabGroup->SetObserver( this );
-            }
-        }
-
-    iNaviPane->PushL( *iNaviDecoratorEmpty );
-    iList = STATIC_CAST( CAknSettingStyleListBox*, 
-                                        Control( KWepMainSettingsListboxId ) );
-
-    iList->CreateScrollBarFrameL( ETrue );
-    iList->ScrollBarFrame()->SetScrollBarVisibilityL
-        ( CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto );
-
-    HandleListboxDataChangeL();
-
-    iList->SetCurrentItemIndex( 0 );
-    iList->SetListBoxObserver( this );
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::DynInitMenuPaneL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::DynInitMenuPaneL( TInt aResourceId, 
-                                                CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-    if ( aResourceId == R_WEP_SECURITY_SETTINGS_MENU )
-        {
-        if( !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-        }
-    }
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsDlg::FillListWithDataL
-//----------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::FillListWithDataL( CDesCArrayFlat& aItemArray,
-                                   const CWEPSecuritySettings::TWepMember& arr, 
-                                   TInt aLength,
-                                   const TInt* aRes )
-    {
-    _LIT( KTxtMenuListItemFormat, " \t%S\t\t" );
-    const TInt KSpaceAndTabsLength = 4;
-
-    CWEPSecuritySettings::TWepMember* wepMember = 
-                       MUTABLE_CAST( CWEPSecuritySettings::TWepMember*, &arr );
-
-    for( TInt i = 0; i < aLength; i++ )
-        {
-        if ( *wepMember == CWEPSecuritySettings::EWepKeyConfiguration )
-            {
-            // Define a heap descriptor to hold all the item text
-            // HBufC is non-modifiable
-            HBufC* title = iEikonEnv->AllocReadResourceLC( *aRes );
-
-            // Define a heap descriptor to hold all the item text
-            HBufC* itemText = HBufC::NewLC( title->Length() + 
-                                            KSpaceAndTabsLength );
-
-            // Define a modifiable pointer descriptor to be able to append
-            // text to the non-modifiable heap descriptor itemText
-            TPtr itemTextPtr = itemText->Des();
-            itemTextPtr.Format( KTxtMenuListItemFormat, title );
-
-            aItemArray.AppendL( *itemText );
-
-            CleanupStack::PopAndDestroy( 2, title );   // itemText, title
-            }
-        else
-            {
-            HBufC* itemText = CreateTextualListBoxItemL( *wepMember, 
-                                                         *aRes );
-            CleanupStack::PushL( itemText );
-            aItemArray.AppendL( itemText->Des() );
-            CleanupStack::PopAndDestroy( itemText );
-            }
-
-        wepMember++;
-        aRes++;
-        }
-    }
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsDlg::UpdateListBoxItemL
-//----------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::UpdateListBoxItemL( 
-                                    CWEPSecuritySettings::TWepMember aMember, 
-                                    TInt aRes, TInt aPos )
-    {
-    HBufC* itemText = CreateTextualListBoxItemL( aMember, aRes );
-    CleanupStack::PushL( itemText );
-    // first try to add, if Leaves, list will be untouched
-    iItemArray->InsertL( aPos, itemText->Des() );
-    // if successful, previous item is scrolled up with one,
-    // so delete that one...
-    if ( ++aPos < iItemArray->MdcaCount() )
-        {
-        iItemArray->Delete( aPos );
-        }
-    CleanupStack::PopAndDestroy( itemText );
-    }
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsDlg::CreateTextualListBoxItemL
-//----------------------------------------------------------
-//
-HBufC* CWEPSecuritySettingsDlg::CreateTextualListBoxItemL( 
-                                      CWEPSecuritySettings::TWepMember aMember,
-                                      TInt aRes )
-    {
-    // Define a heap descriptor to hold all the item text
-    // HBufC is non-modifiable
-    HBufC* title = iEikonEnv->AllocReadResourceLC( aRes );
-
-    // both variables needed independently of the following conditions so I
-    // must declare them here...
-    HBufC16* value;
-    TUint32 valueResourceID;
-
-    switch ( aMember )
-        {
-        case CWEPSecuritySettings::EWepKeyInUse:
-            {
-            switch ( iSecuritySettings->KeyInUse() )
-                {
-                case CWEPSecuritySettings::EKeyNumber1:
-                    {
-                    valueResourceID = R_WEP_KEY_NUMBER_1;
-                    break;
-                    }
-
-                case CWEPSecuritySettings::EKeyNumber2:
-                    {
-                    valueResourceID = R_WEP_KEY_NUMBER_2;
-                    break;
-                    }
-
-                case CWEPSecuritySettings::EKeyNumber3:
-                    {
-                    valueResourceID = R_WEP_KEY_NUMBER_3;
-                    break;
-                    }
-
-                case CWEPSecuritySettings::EKeyNumber4:
-                    {
-                    valueResourceID = R_WEP_KEY_NUMBER_4;
-                    break;
-                    }
-
-                default:
-                    {
-                    valueResourceID = 0;
-                    break;
-                    }
-                }
-            break;
-            }
-        
-        case CWEPSecuritySettings::EWepAuthentication:
-            {
-            switch ( iSecuritySettings->Authentication() )
-                {
-                case CWEPSecuritySettings::EAuthOpen:
-                    {
-                    valueResourceID = R_WEP_AUTHENTICATION_OPEN;
-                    break;
-                    }
-
-                case CWEPSecuritySettings::EAuthShared:
-                    {
-                    valueResourceID = R_WEP_AUTHENTICATION_SHARED;
-                    break;
-                    }
-
-                default:
-                    {
-                    valueResourceID = 0;
-                    break;
-                    }
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyLength:
-            {
-            switch ( iSecuritySettings->KeyLength( iActiveTab ) )
-                {
-                case CWEPSecuritySettings::E40Bits:
-                    {
-                    valueResourceID = R_WEP_KEY_LENGTH_64_BITS;
-                    break;
-                    }
-
-                case CWEPSecuritySettings::E104Bits:
-                    {
-                    valueResourceID = R_WEP_KEY_LENGTH_128_BITS;
-                    break;
-                    }
-
-                case CWEPSecuritySettings::E232Bits:
-                    {
-                    valueResourceID = iSecuritySettings->WEP256Enabled() ? 
-                                                R_WEP_KEY_LENGTH_256_BITS : 0;
-                    break;
-                    }
-
-                default:
-                    {
-                    valueResourceID = 0;
-                    break;
-                    }
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyFormat:
-            {
-            switch ( iSecuritySettings->KeyFormat( iActiveTab ) )
-                {
-                case CWEPSecuritySettings::EAscii:
-                    {
-                    valueResourceID = R_WEP_KEY_FORMAT_ASCII;
-                    break;
-                    }
-
-                case CWEPSecuritySettings::EHexadecimal:
-                    {
-                    valueResourceID = R_WEP_KEY_FORMAT_HEX;
-                    break;
-                    }
-
-                default:
-                    {
-                    valueResourceID = 0;
-                    break;
-                    }
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyData:
-            {
-            if ( !iSecuritySettings->KeyData( iActiveTab )->Length() )
-                {
-                valueResourceID = R_WEP_KEY_DATA_MUST_BE_DEFINED;
-                }
-            else
-                {
-                valueResourceID = 0;
-                }
-
-            break;
-            }
-
-        default:
-            {
-            valueResourceID = 0;
-            break;
-            }
-        }
-
-    _LIT( KStars, "****" );
-    _LIT( KTxtListItemFormat, " \t%S\t\t%S" );
-    const TInt KSpaceAndTabsLength = 4;
-    _LIT( KTxtCompulsory, "\t*" );
-
-    if ( valueResourceID )
-        {
-        // Read up value text from resource
-        value = iEikonEnv->AllocReadResourceLC( valueResourceID );
-        if( aMember == CWEPSecuritySettings::EWepKeyInUse )
-            {
-            TPtr localizedValue( value->Des() );
-            AknTextUtils::LanguageSpecificNumberConversion( localizedValue );
-            }
-        }
-    else
-        {
-        value = HBufC::NewLC( KStars().Length() );
-        value->Des().Copy( KStars ); 
-        }
-
-    // Define a heap descriptor to hold all the item text
-    // +4 for space and tab characters
-    TInt length = title->Length() + value->Length() + KSpaceAndTabsLength;
-    if ( aMember == CWEPSecuritySettings::EWepKeyData )  // Compulsory
-        {
-        length += KTxtCompulsory().Length();
-        }
-
-    HBufC* itemText = HBufC::NewLC( length );
-
-    // Define a modifiable pointer descriptor to be able to append text to the
-    // non-modifiable heap descriptor itemText
-    TPtr itemTextPtr = itemText->Des();
-    itemTextPtr.Format( KTxtListItemFormat, title, value );
-    if ( aMember == CWEPSecuritySettings::EWepKeyData )  // Compulsory
-        {
-        itemTextPtr.Append( KTxtCompulsory );
-        }
-    CleanupStack::Pop( itemText );    // itemtext,
-
-    CleanupStack::PopAndDestroy( 2, title ); // title, value
-
-    return itemText;
-    }
-
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsDlg::ShowPopupSettingPageL
-//----------------------------------------------------------
-//
-TBool CWEPSecuritySettingsDlg::ShowPopupSettingPageL( 
-                                       CWEPSecuritySettings::TWepMember aData )
-    {
-    TInt currvalue( 0 );
-    TBool retval( EFalse );
-    CDesCArrayFlat* items = FillPopupSettingPageLC( aData,  currvalue );
-
-    TInt attr_resid( 0 );
-
-    // not text based ones:
-    switch ( aData )
-        {
-        case CWEPSecuritySettings::EWepKeyInUse:
-            {
-            attr_resid = R_WEP_KEY_IN_USE;
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepAuthentication:
-            {
-            attr_resid = R_WEP_AUTHENTICATION;
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyLength:
-            {
-            attr_resid = R_WEP_KEY_LENGTH;
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyFormat:
-            {
-            attr_resid = R_WEP_KEY_FORMAT;
-            break;
-            }
-
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EUnknownCase ) );
-            attr_resid = 0;
-            break;
-            }
-        }
-
-    HBufC* titlebuf;
-    CAknRadioButtonSettingPage* dlg;
-    if ( attr_resid )
-        {
-        titlebuf = iEikonEnv->AllocReadResourceLC( attr_resid );
-        dlg = new ( ELeave )CAknRadioButtonSettingPage( 
-                            R_RADIO_BUTTON_SETTING_PAGE, currvalue, items );
-        CleanupStack::PushL( dlg ); 
-        TPtrC ptr( titlebuf->Des() );
-        dlg->SetSettingTextL( ptr );
-        CleanupStack::Pop( dlg ); // dlg
-        }
-    else
-        {
-        dlg = new ( ELeave )CAknRadioButtonSettingPage( 
-                            R_RADIO_BUTTON_SETTING_PAGE, currvalue, items );
-        }
-    if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenAccepted ) )
-        {
-    	retval = UpdateFromPopupSettingPage( aData, currvalue );
-	    }
-
-    if ( attr_resid )
-        {
-        CleanupStack::PopAndDestroy( titlebuf ); // titlebuf
-        }
-
-    CleanupStack::PopAndDestroy( items );   // items. It deletes also all 
-                                            // elements in the array.
-    return retval;
-    }
-
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsDlg::ShowPopupTextSettingPageL
-//----------------------------------------------------------
-//
-TBool CWEPSecuritySettingsDlg::ShowPopupTextSettingPageL()
-    {
-    TBool retval( EFalse );
-
-    CWEPSecuritySettings::TWEPKeyFormat keyFormat = 
-                                    iSecuritySettings->KeyFormat( iActiveTab );
-    TInt expectedLength = iSecuritySettings->ExpectedLengthOfKeyData( 
-                                iSecuritySettings->KeyLength( iActiveTab ) );
-
-    if ( keyFormat == CWEPSecuritySettings::EAscii )
-        {
-        expectedLength /= KAsciiHexRatio; //Ascii key is half the length of Hex
-        }
-
-    HBufC16* bufKeyData = HBufC16::NewLC( expectedLength );
-    TPtr16 ptrKeyData( bufKeyData->Des() );
-
-    TBool showPage( ETrue );
-    while ( showPage )
-        {
-        CWEPKeyDataTextSettingPage* dlg = 
-            new( ELeave )CWEPKeyDataTextSettingPage( ptrKeyData, 
-                                                     expectedLength,
-                                                     keyFormat );
-
-        if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenAccepted ) )
-            {
-            HBufC8* buf8 = HBufC8::NewLC( bufKeyData->Des().Length() );
-            buf8->Des().Copy( bufKeyData->Des() ); 
-
-            TInt err = iSecuritySettings->VerifyKeyData( *buf8, expectedLength,
-                                iSecuritySettings->KeyFormat( iActiveTab ) );
-            if ( err == KErrNone )
-                {
-                if ( keyFormat == CWEPSecuritySettings::EAscii )
-                    {
-                    HBufC8* buf8Conv = 
-                                HBufC8::NewLC( bufKeyData->Des().Length()
-                                                            * KAsciiHexRatio );
-                                        // Ascii key is half the length of Hex
-
-                    iSecuritySettings->ConvertAsciiToHex( buf8->Des(), 
-                                                          buf8Conv );
-                    iSecuritySettings->SetKeyData( iActiveTab, 
-                                                   buf8Conv->Des() );
-                    CleanupStack::PopAndDestroy( buf8Conv ); // buf8Conv
-                    }
-                else
-                    {
-                    iSecuritySettings->SetKeyData( iActiveTab, buf8->Des() );
-                    }
-
-                retval = ETrue;
-                showPage = EFalse;
-                }
-            else
-                {
-                HBufC* stringLabel;
-                
-                if ( err == KErrInvalidLength )
-                    {
-                    stringLabel = StringLoader::LoadL( R_INFO_WEP_KEY_TOO_SHORT,
-                                                       expectedLength, 
-                                                       iEikonEnv );
-                    }
-                else
-                    {
-                    stringLabel = StringLoader::LoadL( 
-                                                R_INFO_WEP_KEY_ILLEGAL_CHARS,
-                                                iEikonEnv );
-                    }
-
-                CleanupStack::PushL( stringLabel );
-
-	            CAknInformationNote* dialog = new (ELeave)CAknInformationNote( 
-                                                                        ETrue );
-                CleanupStack::Pop( stringLabel );
-
-                dialog->ExecuteLD( *stringLabel );
-
-                delete stringLabel;   // stringLabel
-
-                ptrKeyData.Zero();
-                }
-
-            CleanupStack::PopAndDestroy( buf8 ); // buf8
-            }
-        else
-            {
-            showPage = EFalse;
-            }
-        }
-
-    CleanupStack::PopAndDestroy( bufKeyData ); // bufKeyData
-
-    return retval;
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::FillPopupSettingPageLC
-// ---------------------------------------------------------
-//
-CDesCArrayFlat* CWEPSecuritySettingsDlg::FillPopupSettingPageLC( 
-                                       CWEPSecuritySettings::TWepMember aData,
-                                       TInt& aCurrvalue )
-    {
-    CDesCArrayFlat* items = new( ELeave)CDesCArrayFlat( 1 );
-    CleanupStack::PushL( items );
-
-    switch ( aData )
-        {
-        case CWEPSecuritySettings::EWepKeyInUse:
-            {
-            RBuf16 convert( iEikonEnv->AllocReadResourceL( 
-                                                        R_WEP_KEY_NUMBER_1 ) );
-            AknTextUtils::LanguageSpecificNumberConversion( convert );
-            items->AppendL( convert );
-            convert.Close();
-            
-            convert.Assign( iEikonEnv->AllocReadResourceL(
-                                                        R_WEP_KEY_NUMBER_2 ) );
-            AknTextUtils::LanguageSpecificNumberConversion( convert );
-            items->AppendL( convert );
-            convert.Close();
-            
-            convert.Assign( iEikonEnv->AllocReadResourceL(
-                                                        R_WEP_KEY_NUMBER_3 ) );
-            AknTextUtils::LanguageSpecificNumberConversion( convert );
-            items->AppendL( convert );
-            convert.Close();
-            
-            convert.Assign( iEikonEnv->AllocReadResourceL(
-                                                        R_WEP_KEY_NUMBER_4 ) );
-            AknTextUtils::LanguageSpecificNumberConversion( convert );
-            items->AppendL( convert );
-            convert.Close();
-
-            aCurrvalue = iSecuritySettings->KeyInUse();
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepAuthentication:
-            {
-            items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                            R_WEP_AUTHENTICATION_OPEN ) );
-            CleanupStack::PopAndDestroy();
-            items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                            R_WEP_AUTHENTICATION_SHARED ) );
-            CleanupStack::PopAndDestroy();
-
-            aCurrvalue = iSecuritySettings->Authentication();
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyLength:
-            {
-            items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                            R_WEP_KEY_LENGTH_64_BITS ) );
-            CleanupStack::PopAndDestroy();
-            items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                            R_WEP_KEY_LENGTH_128_BITS ) );
-            CleanupStack::PopAndDestroy();
-
-            if ( iSecuritySettings->WEP256Enabled() )
-                {
-                items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                            R_WEP_KEY_LENGTH_256_BITS ) );
-                CleanupStack::PopAndDestroy();
-                }
-
-            aCurrvalue = iSecuritySettings->KeyLength( iActiveTab );
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyFormat:
-            {
-            items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                            R_WEP_KEY_FORMAT_ASCII ) );
-            CleanupStack::PopAndDestroy();
-            items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                            R_WEP_KEY_FORMAT_HEX ) );
-            CleanupStack::PopAndDestroy();
-
-            aCurrvalue = iSecuritySettings->KeyFormat( iActiveTab );
-            break;
-            }
-
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic ( EUnknownCase ) );
-            break;
-            }
-        }
-    return items;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::UpdateFromPopupSettingPage
-// ---------------------------------------------------------
-//
-TBool CWEPSecuritySettingsDlg::UpdateFromPopupSettingPage( 
-                                        CWEPSecuritySettings::TWepMember aData,
-                                        TInt aCurrvalue )
-    {
-    TBool retVal( EFalse );
-
-    switch ( aData )
-        {
-        case CWEPSecuritySettings::EWepKeyInUse:
-            {
-            if ( iSecuritySettings->KeyInUse() != 
-                             ( CWEPSecuritySettings::TWEPKeyInUse )aCurrvalue )
-                {
-                iSecuritySettings->SetKeyInUse( 
-                            ( CWEPSecuritySettings::TWEPKeyInUse )aCurrvalue );
-                retVal = ETrue;
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepAuthentication:
-            {
-            if ( iSecuritySettings->Authentication() != 
-                 ( CWEPSecuritySettings::TWEPAuthentication )aCurrvalue )
-                {
-                iSecuritySettings->SetAuthentication( 
-                      ( CWEPSecuritySettings::TWEPAuthentication )aCurrvalue );
-                retVal = ETrue;
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyLength:
-            {
-            if ( iSecuritySettings->KeyLength( iActiveTab ) != 
-                 ( CWEPSecuritySettings::TWEPKeyLength )aCurrvalue )
-                {
-                iSecuritySettings->SetKeyLength( iActiveTab, 
-                           ( CWEPSecuritySettings::TWEPKeyLength )aCurrvalue );
-                retVal = ETrue;
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyFormat:
-            {
-            if ( iSecuritySettings->KeyFormat( iActiveTab ) != 
-                 ( CWEPSecuritySettings::TWEPKeyFormat )aCurrvalue )
-                {
-                iSecuritySettings->SetKeyFormat( iActiveTab, 
-                           ( CWEPSecuritySettings::TWEPKeyFormat )aCurrvalue );
-                retVal = ETrue;
-                }
-            break;
-            }
-
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EUnknownCase ) );
-            break;
-            }
-        }
-
-    return retVal;
-    }
-
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsDlg::ChangeSettingsL
-//----------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::ChangeSettingsL( TBool aQuick )
-    {
-    TInt itemIndex = ( Max( iList->CurrentItemIndex(), 0 ) );
-    CWEPSecuritySettings::TWepMember* ptr = 
-                  (iLevel ? iFieldsKeyConfiguration : iFieldsMain) + itemIndex;
-    TInt* tptr = ( iLevel ? iTitlesKeyConfiguration : iTitlesMain ) + itemIndex;
-
-    const TInt KShiftFromKeyLengthToKeyData = 2;
-    switch ( *ptr  )
-        {
-        case CWEPSecuritySettings::EWepKeyInUse:
-        case CWEPSecuritySettings::EWepKeyLength:
-            { // Pop-up setting item
-            if ( ShowPopupSettingPageL( *ptr ) )
-                {
-                UpdateListBoxItemL( *ptr, *tptr, itemIndex );
-                *iEventStore |= CWEPSecuritySettings::EModified;
-                if ( *ptr == CWEPSecuritySettings::EWepKeyLength )
-                    {
-                    ptr += KShiftFromKeyLengthToKeyData;
-                    tptr += KShiftFromKeyLengthToKeyData;
-                    iSecuritySettings->KeyData( iActiveTab )->Zero();
-                    UpdateListBoxItemL( *ptr, *tptr, 
-                                    itemIndex+KShiftFromKeyLengthToKeyData );
-                    iList->SetCurrentItemIndexAndDraw( itemIndex+
-                                                KShiftFromKeyLengthToKeyData );
-                    }
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepAuthentication:
-        case CWEPSecuritySettings::EWepKeyFormat:
-            { // Setting item with two available values
-            TBool changed( ETrue );
-            if ( aQuick )
-                {
-                InvertSettings( *ptr );
-                }
-            else
-                {
-                changed = ShowPopupSettingPageL( *ptr );
-                }
-
-            if ( changed )
-                {
-                UpdateListBoxItemL( *ptr, *tptr, itemIndex );
-                if ( *ptr == CWEPSecuritySettings::EWepAuthentication )
-                    {
-                    *iEventStore |= CWEPSecuritySettings::EModified;
-                    }
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyData:
-            { // Text setting item
-            if ( ShowPopupTextSettingPageL() )
-                {
-                UpdateListBoxItemL( *ptr, *tptr, itemIndex );
-                *iEventStore |= CWEPSecuritySettings::EModified;
-                }
-            break;
-            }
-
-        case CWEPSecuritySettings::EWepKeyConfiguration:
-            {
-            iLevel = 1;
-
-            iActiveTab = iSecuritySettings->KeyInUse();
-            iTabGroup->SetActiveTabByIndex( iActiveTab );
-
-            HandleListboxDataChangeL();
-            itemIndex = 0;
-
-            break;
-            }
-
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EUnknownCase ) );
-            break;
-            }
-        }
-
-    iList->ScrollToMakeItemVisible( itemIndex );
-    iList->SetCurrentItemIndexAndDraw( itemIndex );
-    }
-
-
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsDlg::InvertSettings
-//----------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::InvertSettings( CWEPSecuritySettings::TWepMember 
-                                                                  aDataMember )
-    {
-    if ( aDataMember == CWEPSecuritySettings::EWepAuthentication )
-        {
-        if ( iSecuritySettings->Authentication() == 
-                                              CWEPSecuritySettings::EAuthOpen )
-            {
-            iSecuritySettings->SetAuthentication( 
-                                            CWEPSecuritySettings::EAuthShared );
-            }
-        else
-            {
-            iSecuritySettings->SetAuthentication( 
-                                              CWEPSecuritySettings::EAuthOpen );
-            }
-        }
-    else if ( aDataMember == CWEPSecuritySettings::EWepKeyFormat )
-        {
-        if ( iSecuritySettings->KeyFormat( iActiveTab ) == 
-                                                 CWEPSecuritySettings::EAscii )
-            {
-            iSecuritySettings->SetKeyFormat( iActiveTab, 
-                                          CWEPSecuritySettings::EHexadecimal );
-            }
-        else
-            {
-            iSecuritySettings->SetKeyFormat( iActiveTab, 
-                                                 CWEPSecuritySettings::EAscii );
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsDlg::GetHelpContext
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsDlg::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CWEPSecuritySettingsDlg::TabChangedL( TInt aIndex )
-// -----------------------------------------------------------------------------
-// 
-void CWEPSecuritySettingsDlg::TabChangedL( TInt aIndex )
-    {
-    iActiveTab = aIndex;
-    HandleListboxDataChangeL();
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsImpl.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,606 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWEPSecuritySettingsImpl.     
-*
-*/
-
-/*
-* %version: tr1cfwln#26 %
-*/
-
-// INCLUDE FILES
-
-#include "WEPSecuritySettingsImpl.h"
-#include "WEPSecuritySettingsUiPanic.h"
-
-#include <WEPSecuritySettingsUI.h>
-#include <commdb.h>
-#include <featmgr.h>
-#include <WlanCdbCols.h>
-
-#include <commsdattypesv1_1.h>
-#include <cmmanagertablefields.h>
-#include <wlancontainer.h>
-
-// CONSTANT DECLARATIONS
-
-// Index of first key
-LOCAL_D const TInt KFirstKey = 0;
-
-// Index of second key
-LOCAL_D const TInt KSecondKey = 1;
-
-// Index of third key
-LOCAL_D const TInt KThirdKey = 2;
-
-// Index of fourth key
-LOCAL_D const TInt KFourthKey = 3;
-
-// Ratio of ascii and hex key sizes
-LOCAL_D const TInt KAsciiHexRatio = 2;
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::NewL
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsImpl* CWEPSecuritySettingsImpl::NewL()
-    {
-    CWEPSecuritySettingsImpl* settings = 
-                                    new ( ELeave ) CWEPSecuritySettingsImpl();
-    CleanupStack::PushL( settings );
-    settings->ConstructL();
-    CleanupStack::Pop( settings ); 
-    return settings;    
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::CWEPSecuritySettingsImpl
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsImpl::CWEPSecuritySettingsImpl()
-: iIsWEP256Enabled( ETrue )
-    {
-    iKeyInUse = CWEPSecuritySettings::EKeyNumber1;
-    iAuthentication = CWEPSecuritySettings::EAuthOpen;
-    for ( TUint i = 0; i < KMaxNumberofKeys; i++)
-        {
-        iKeyLength[i] = CWEPSecuritySettings::E40Bits;
-        iKeyFormat[i] = CWEPSecuritySettings::EAscii;
-        iKeyData[i].Zero();
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsImpl::ConstructL()
-    {
-    // WEP256 is deprecated.
-    iIsWEP256Enabled = EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::~CWEPSecuritySettingsImpl
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsImpl::~CWEPSecuritySettingsImpl()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::LoadL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsImpl::LoadL( TUint32 aIapId, 
-                                      CCommsDatabase& aCommsDb )
-    {
-    if ( aIapId == KUidNone )
-        {
-        return;
-        }
-
-    CCommsDbTableView* wLanServiceTable;
-        
-    wLanServiceTable = aCommsDb.OpenViewMatchingUintLC(
-                    TPtrC( WLAN_SERVICE ), TPtrC( WLAN_SERVICE_ID ), aIapId );
-
-    TInt errorCode = wLanServiceTable->GotoFirstRecord();
-    if ( errorCode == KErrNone )
-        {
-        // Get index of key in use
-        TRAPD( err, wLanServiceTable->ReadUintL( TPtrC( WLAN_WEP_INDEX ),
-                                    ( TUint32& ) iKeyInUse ) );
-
-        // Get index of key in use
-        TRAP( err, wLanServiceTable->ReadUintL( 
-                                        TPtrC( NU_WLAN_AUTHENTICATION_MODE ),
-                                        ( TUint32& ) iAuthentication ) );
-
-        // Get first WEP key
-        wLanServiceTable->ReadTextL( TPtrC( NU_WLAN_WEP_KEY1 ), 
-                                     iKeyData[KFirstKey] );
-        SetLenKeyDataFromText( KFirstKey );
-
-        // Get second WEP key
-        wLanServiceTable->ReadTextL( TPtrC( NU_WLAN_WEP_KEY2 ), 
-                                     iKeyData[KSecondKey] );
-        SetLenKeyDataFromText( KSecondKey );
-
-        // Get third WEP key
-        wLanServiceTable->ReadTextL( TPtrC( NU_WLAN_WEP_KEY3 ), 
-                                     iKeyData[KThirdKey] );
-        SetLenKeyDataFromText( KThirdKey );
-
-        // Get fourth WEP key
-        wLanServiceTable->ReadTextL( TPtrC( NU_WLAN_WEP_KEY4 ), 
-                                     iKeyData[KFourthKey] );
-        SetLenKeyDataFromText( KFourthKey );
-
-
-        // Get the format of the keys
-        TRAP( err, wLanServiceTable->ReadUintL( TPtrC( WLAN_WEP_KEY1_FORMAT ),
-                                    ( TUint32& ) iKeyFormat[KFirstKey] ) );
-
-        TRAP( err, wLanServiceTable->ReadUintL( TPtrC( WLAN_WEP_KEY2_FORMAT ),
-                                    ( TUint32& ) iKeyFormat[KSecondKey] ) );
-
-        TRAP( err, wLanServiceTable->ReadUintL( TPtrC( WLAN_WEP_KEY3_FORMAT ),
-                                    ( TUint32& ) iKeyFormat[KThirdKey] ) );
-
-        TRAP( err, wLanServiceTable->ReadUintL( TPtrC( WLAN_WEP_KEY4_FORMAT ),
-                                    ( TUint32& ) iKeyFormat[KFourthKey] ) );
-        }
-    else
-        {
-        // silently ignore KErrNotFound. It is caused by incorrect DB,
-        // we are 'repairing it' this way.
-        if ( errorCode != KErrNotFound )
-            {
-            User::Leave( errorCode );
-            }
-        }
-
-    CleanupStack::PopAndDestroy( wLanServiceTable );  // wLanServiceTable
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SaveL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsImpl::SaveL( TUint32 aIapId, 
-                                      CCommsDatabase& aCommsDb ) const
-    {
-    CCommsDbTableView* wLanServiceTable;
-
-    // Caller MUST initiate a transaction, WE WILL NOT.
-
-    wLanServiceTable = aCommsDb.OpenViewMatchingUintLC( 
-                    TPtrC( WLAN_SERVICE ), TPtrC( WLAN_SERVICE_ID ), aIapId );
-    TInt errorCode = wLanServiceTable->GotoFirstRecord();
-
-    if ( errorCode == KErrNone )
-        {
-        wLanServiceTable->UpdateRecord();
-        }
-    else
-        {
-        TUint32 dummyUid( KUidNone );
-        User::LeaveIfError( wLanServiceTable->InsertRecord( dummyUid ) );
-
-        // Save link to LAN service
-        wLanServiceTable->WriteUintL( TPtrC( WLAN_SERVICE_ID ), aIapId );
-        }
-
-    // Save index of key in use
-    wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_INDEX ), 
-                                 ( TUint32& ) iKeyInUse );
-
-    // Save index of key in use
-    wLanServiceTable->WriteUintL( TPtrC( NU_WLAN_AUTHENTICATION_MODE ), 
-                                 ( TUint32& ) iAuthentication );
-
-    // Save first WEP key
-    wLanServiceTable->WriteTextL( TPtrC( NU_WLAN_WEP_KEY1 ), 
-                                  iKeyData[KFirstKey] );
-
-    // Save second WEP key
-    wLanServiceTable->WriteTextL( TPtrC( NU_WLAN_WEP_KEY2 ), 
-                                  iKeyData[KSecondKey] );
-
-    // Save third WEP key
-    wLanServiceTable->WriteTextL( TPtrC( NU_WLAN_WEP_KEY3 ), 
-                                  iKeyData[KThirdKey] );
-
-    // Save fourth WEP key
-    wLanServiceTable->WriteTextL( TPtrC( NU_WLAN_WEP_KEY4 ), 
-                                  iKeyData[KFourthKey] );
-
-    // Save the format of the keys
-    wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_KEY1_FORMAT ), 
-                                 ( TUint32& ) iKeyFormat[KFirstKey] );
-
-    wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_KEY2_FORMAT ), 
-                                 ( TUint32& ) iKeyFormat[KSecondKey] );
-
-    wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_KEY3_FORMAT ), 
-                                 ( TUint32& ) iKeyFormat[KThirdKey] );
-
-    wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_KEY4_FORMAT ), 
-                                 ( TUint32& ) iKeyFormat[KFourthKey] );
-
-    wLanServiceTable->PutRecordChanges();
-
-    CleanupStack::PopAndDestroy( wLanServiceTable );  // wLanServiceTable
-    }
-    
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SetLenKeyDataFromText
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsImpl::SetLenKeyDataFromText( const TInt aIndex )
-    {
-    const TUint keyDataLength = iKeyData[aIndex].Length();
-
-    if ( keyDataLength == KKeyDataLength104Bits )
-        {
-        iKeyLength[aIndex] = CWEPSecuritySettings::E104Bits;
-        }
-    else if ( keyDataLength == KKeyDataLength232Bits && iIsWEP256Enabled )
-        {
-        iKeyLength[aIndex] = CWEPSecuritySettings::E232Bits;
-        }
-    else            // if ( aKeyDataLength == KKeyDataLength40Bits ) or any
-        {           //  other case, by default
-        iKeyLength[aIndex] = CWEPSecuritySettings::E40Bits;
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::IsValid
-// ---------------------------------------------------------
-//
-TBool CWEPSecuritySettingsImpl::IsValid()
-    {
-    return ( KeyData( KeyInUse() )->Length() == 
-                        ExpectedLengthOfKeyData( KeyLength( KeyInUse() ) ) );
-    }
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsImpl::ExpectedLengthOfKeyData
-//----------------------------------------------------------
-//
-TInt CWEPSecuritySettingsImpl::ExpectedLengthOfKeyData( 
-                               CWEPSecuritySettings::TWEPKeyLength aKeyLength )
-    {
-    TInt retVal;
-
-    switch ( aKeyLength )
-        {
-        case CWEPSecuritySettings::E40Bits:
-            {
-            retVal = KKeyDataLength40Bits;
-            break;
-            }
-
-        case CWEPSecuritySettings::E104Bits:
-            {
-            retVal = KKeyDataLength104Bits;
-            break;
-            }
-
-        case CWEPSecuritySettings::E232Bits:
-            {
-            retVal = WEP256Enabled() ? KKeyDataLength232Bits : 0;
-            break;
-            }
-
-        default:
-            {
-            retVal = 0;
-            break;
-            }
-        }
-
-    return retVal;
-    }
- 
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SetKeyDataL
-// ---------------------------------------------------------
-//
-TInt CWEPSecuritySettingsImpl::SetKeyDataL( const TInt aElement, 
-                                            const TDesC& aKeyData,
-                                            const TBool aHex )
-    {
-    CWEPSecuritySettings::TWEPKeyFormat keyFormat = aHex ? 
-                                    CWEPSecuritySettings::EHexadecimal : 
-                                    CWEPSecuritySettings::EAscii;
-    SetKeyFormat( aElement, keyFormat );
-
-    TInt dataLength = aKeyData.Length();
-    if ( dataLength == KKeyDataLength40Bits ||
-         dataLength == KKeyDataLength40Bits / KAsciiHexRatio )
-        {
-        SetKeyLength( aElement, CWEPSecuritySettings::E40Bits );
-        }
-    else if ( dataLength == KKeyDataLength104Bits ||
-         dataLength == KKeyDataLength104Bits / KAsciiHexRatio )
-        {
-        SetKeyLength( aElement, CWEPSecuritySettings::E104Bits );
-        }
-    else if ( dataLength == KKeyDataLength232Bits ||
-         dataLength == KKeyDataLength232Bits / KAsciiHexRatio )
-        {
-        SetKeyLength( aElement, CWEPSecuritySettings::E232Bits );
-        }
-    else
-        {
-        return KErrInvalidLength;
-        }
-
-    TInt expectedLength = ExpectedLengthOfKeyData( KeyLength( aElement ) );
-
-    if ( keyFormat == CWEPSecuritySettings::EAscii )
-        {
-        expectedLength /= KAsciiHexRatio; //Ascii key is half the length of Hex
-        }
-
-    HBufC8* buf8 = HBufC8::NewL( dataLength );
-    CleanupStack::PushL( buf8 );
-    buf8->Des().Copy( aKeyData ); 
-
-    TInt errData = VerifyKeyData( *buf8, expectedLength, 
-                                  KeyFormat( aElement ) );
-    if ( errData == KErrNone )
-        {
-        if ( aHex )
-            {
-            SetKeyData( aElement, buf8->Des() );
-            }
-        else
-            {
-            HBufC8* buf8Conv = HBufC8::NewL( dataLength * KAsciiHexRatio );
-                                // Ascii key is half the length of Hex
-            ConvertAsciiToHex( buf8->Des(), buf8Conv );
-            SetKeyData( aElement, buf8Conv->Des() );
-            delete buf8Conv;
-            }
-        }
-
-    CleanupStack::PopAndDestroy( buf8 ); // buf8
-
-    return errData;
-    }
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsImpl::VerifyKeyData
-//----------------------------------------------------------
-//
-TInt CWEPSecuritySettingsImpl::VerifyKeyData( const TDesC8& aTextToTest,
-                                             TInt aLengthOfKeyData,
-                            CWEPSecuritySettings::TWEPKeyFormat aWEPKeyFormat )
-    {
-    TInt err = KErrNone;
-    TInt lengthOfText = aTextToTest.Length();
-
-    if ( aTextToTest.Length() != aLengthOfKeyData )
-        {
-        err = KErrInvalidLength;
-        }
-    else if ( aWEPKeyFormat == CWEPSecuritySettings::EHexadecimal )
-        {
-        for ( TInt i = 0; i < lengthOfText; i++ )
-            {
-            TChar c ( aTextToTest[i] );
-
-            if ( !c.IsHexDigit() ) 
-                {
-                err = KErrInvalidChar;
-                break;
-                }
-            }
-        }
-
-    return err;
-    }
-
-
-//----------------------------------------------------------
-// CWEPSecuritySettingsImpl::ConvertAsciiToHex
-//----------------------------------------------------------
-//
-void CWEPSecuritySettingsImpl::ConvertAsciiToHex( const TDesC8& aSource, 
-                                                  HBufC8*& aDest )
-	{
-	_LIT( hex, "0123456789ABCDEF" );
-	TInt size = aSource.Size();
-	TPtr8 ptr = aDest->Des();
-	for ( TInt ii = 0; ii < size; ii++ )
-		{
-		TText8 ch = aSource[ii];
-		ptr.Append( hex()[(ch/16)&0x0f] );
-		ptr.Append( hex()[ch&0x0f] );
-		}
-	}
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::LoadL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsImpl::LoadL( TUint32 aIapId, 
-                                      CMDBSession& aSession )
-    {
-    
-    if ( aIapId == KUidNone )
-        {
-        return;
-        }
-    
-    // Load WLAN service table
-    // first get WLAN table id
-    CMDBGenericRecord* generic = static_cast<CMDBGenericRecord*>
-        ( CCDRecordBase::RecordFactoryL( 0 ) );
-    CleanupStack::PushL( generic );    
-    generic->InitializeL( TPtrC( WLAN_SERVICE ), NULL );
-    generic->LoadL( aSession );
-    TMDBElementId wlanTableId = generic->TableId();
-    
-    CMDBField<TUint32>* sidField = static_cast<CMDBField<TUint32>*>
-                                    (generic->GetFieldByIdL( KCDTIdWlanServiceId));
-    
-    // prime with service id                
-    *sidField = aIapId;
-
-    if( generic->FindL( aSession) )
-        {
-        // get the values
-        CMDBField<TUint>* keyInUseField = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanWepIndex ) );
-        ( TUint32& )iKeyInUse = *keyInUseField;
-        CMDBField<TUint>* authenticationField = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanAuthMode ) );
-        ( TUint32& )iAuthentication = *authenticationField;
-        
-        CMDBField<TDesC8>* wepKey1Field = static_cast<CMDBField<TDesC8>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWepKey1 ) );
-        iKeyData[ KFirstKey ] = *wepKey1Field;
-        SetLenKeyDataFromText( KFirstKey );
-        
-        CMDBField<TDesC8>* wepKey2Field = static_cast<CMDBField<TDesC8>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWepKey2 ) );
-        iKeyData[ KSecondKey ] = *wepKey2Field;
-        SetLenKeyDataFromText( KSecondKey );
-        
-        CMDBField<TDesC8>* wepKey3Field = static_cast<CMDBField<TDesC8>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWepKey3 ) );
-        iKeyData[ KThirdKey ] = *wepKey3Field;
-        SetLenKeyDataFromText( KThirdKey );
-        
-        CMDBField<TDesC8>* wepKey4Field = static_cast<CMDBField<TDesC8>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWepKey4 ) );
-        iKeyData[ KFourthKey ] = *wepKey4Field;
-        SetLenKeyDataFromText( KFourthKey );
-        
-        CMDBField<TUint>* formatKey1Field = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanFormatKey1 ) );
-        ( TUint32& )iKeyFormat[ KFirstKey ] = *formatKey1Field;
-        CMDBField<TUint>* formatKey2Field = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanFormatKey2 ) );
-        ( TUint32& )iKeyFormat[ KSecondKey ] = *formatKey2Field;
-        CMDBField<TUint>* formatKey3Field = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanFormatKey3 ) );
-        ( TUint32& )iKeyFormat[ KThirdKey ] = *formatKey3Field;
-        CMDBField<TUint>* formatKey4Field = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanFormatKey4 ) );
-        ( TUint32& )iKeyFormat[ KFourthKey ] = *formatKey4Field;
-        }
-
-    CleanupStack::PopAndDestroy( generic );
-    
-    }
-    
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsImpl::SaveL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsImpl::SaveL( TUint32 aIapId, 
-                                      CMDBSession& aSession ) const
-    {
-    // Load WLAN service table
-    // first get WLAN table id
-    CMDBGenericRecord* generic = static_cast<CMDBGenericRecord*>
-        ( CCDRecordBase::RecordFactoryL( 0 ) );
-    CleanupStack::PushL( generic );    
-    generic->InitializeL( TPtrC( WLAN_SERVICE ), NULL );
-    generic->LoadL( aSession );
-    TMDBElementId wlanTableId = generic->TableId();
-    
-    CMDBField<TUint32>* sidField = static_cast<CMDBField<TUint32>*>
-                             ( generic->GetFieldByIdL( KCDTIdWlanServiceId ) );
-    
-    // prime with service id                
-    *sidField = aIapId;
-    
-    TBool found = generic->FindL( aSession);
-   
-    // If loading failed, WLAN service record will be 
-    // created and StoreL()-d, otherwise, ModifyL()
-    
-    CMDBField<TUint>* keyInUseField = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanWepIndex ) );
-    keyInUseField->SetL( iKeyInUse );
-
-    CMDBField<TUint>* authenticationField = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanAuthMode ) );
-    authenticationField->SetL( iAuthentication );
-    
-    CMDBField<TDesC8>* wepKey1Field = static_cast<CMDBField<TDesC8>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWepKey1 ) );
-    wepKey1Field->SetL( iKeyData[ KFirstKey ] );
-    CMDBField<TDesC8>* wepKey2Field = static_cast<CMDBField<TDesC8>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWepKey2 ) );
-    wepKey2Field->SetL( iKeyData[ KSecondKey ] );
-    CMDBField<TDesC8>* wepKey3Field = static_cast<CMDBField<TDesC8>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWepKey3 ) );
-    wepKey3Field->SetL( iKeyData[ KThirdKey ] );
-    CMDBField<TDesC8>* wepKey4Field = static_cast<CMDBField<TDesC8>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWepKey4 ) );
-    wepKey4Field->SetL( iKeyData[ KFourthKey ] );
-    
-    CMDBField<TUint>* formatKey1Field = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanFormatKey1 ) );
-    formatKey1Field->SetL( iKeyFormat[ KFirstKey ] );
-    CMDBField<TUint>* formatKey2Field = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanFormatKey2 ) );
-    formatKey2Field->SetL( iKeyFormat[ KSecondKey ] );
-    CMDBField<TUint>* formatKey3Field = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanFormatKey3 ) );
-    formatKey3Field->SetL( iKeyFormat[ KThirdKey ] );
-    CMDBField<TUint>* formatKey4Field = static_cast<CMDBField<TUint>*>
-                            ( generic->GetFieldByIdL( KCDTIdWlanFormatKey4 ) );
-    formatKey4Field->SetL( iKeyFormat[ KFourthKey ] );
-    
-    // If table existed modify it
-    if( found )
-        {
-        generic->ModifyL( aSession );
-        }
-    // Otherwise store a new record
-    else
-        {
-        generic->SetRecordId( KCDNewRecordRequest );
-        generic->StoreL( aSession );
-        }
-    CleanupStack::PopAndDestroy( generic );
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsUI.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWEPSecuritySettingsUi.  
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-// INCLUDE FILES
-#include <WEPSecuritySettingsUI.h>
-
-#include "WEPSecuritySettingsUiImpl.h"
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUi::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CWEPSecuritySettingsUi* CWEPSecuritySettingsUi::NewL( 
-                                                        CEikonEnv& aEikEnv )
-    {
-    CWEPSecuritySettingsUi* secSett = new( ELeave ) CWEPSecuritySettingsUi();
-    CleanupStack::PushL( secSett );
-    secSett->iImpl = CWEPSecuritySettingsUiImpl::NewL( aEikEnv );
-    CleanupStack::Pop( secSett ); // secSett
-    return secSett;
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUi::~CWEPSecuritySettingsUi
-// ---------------------------------------------------------
-//
-EXPORT_C CWEPSecuritySettingsUi::~CWEPSecuritySettingsUi()
-    {
-    delete iImpl;
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUi::Cvt()
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWEPSecuritySettingsUi::Cvt()
-    {
-    return KErrNone;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsUiImpl.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWEPSecuritySettingsUiImpl. 
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-// INCLUDE FILES
-#include <bautils.h>
-#include <WEPSecuritySettingsUI.h>
-
-#include <data_caging_path_literals.hrh>
-
-#include "WEPSecuritySettingsUiImpl.h"
-#include "WEPSecuritySettingsDlg.h"
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                                      // ROM folder
-_LIT( KResourceFileName, "WEPSecuritySettingsUI.rsc" );     // RSC file name.
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUiImpl::NewL
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsUiImpl* CWEPSecuritySettingsUiImpl::NewL( 
-                                                        CEikonEnv& aEikEnv )
-    {
-    CWEPSecuritySettingsUiImpl* uiImpl = 
-                        new( ELeave ) CWEPSecuritySettingsUiImpl( aEikEnv );
-    CleanupStack::PushL( uiImpl );
-    uiImpl->ConstructL();
-    CleanupStack::Pop( uiImpl ); // uiImpl
-    return uiImpl;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUiImpl::CWEPSecuritySettingsUiImpl
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsUiImpl::CWEPSecuritySettingsUiImpl( CEikonEnv& aEikEnv )
-: iEventStore( ENone ), 
-  iEikEnv( &aEikEnv )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUiImpl::~CWEPSecuritySettingsUiImpl
-// ---------------------------------------------------------
-//
-CWEPSecuritySettingsUiImpl::~CWEPSecuritySettingsUiImpl()
-    {
-    if ( iResOffset )
-        {
-        iEikEnv->DeleteResourceFile( iResOffset );
-        }
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUiImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CWEPSecuritySettingsUiImpl::ConstructL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    BaflUtils::NearestLanguageFile( iEikEnv->FsSession(), fileName );
-    iResOffset = iEikEnv->AddResourceFileL( fileName );
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUiImpl::EditL
-// ---------------------------------------------------------
-//
-TInt CWEPSecuritySettingsUiImpl::EditL( CWEPSecuritySettingsImpl& aSettings,
-                                        const TDesC& aTitle )
-    {
-    iEventStore = ENone;
-
-    CWEPSecuritySettingsDlg* secSettDlg = 
-                                CWEPSecuritySettingsDlg::NewL( iEventStore );
-    secSettDlg->ConstructAndRunLD( &aSettings, aTitle );
-
-    return iEventStore;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsUiPanic.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of panic function.     
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-// INCLUDE FILES
-
-#include <e32std.h>
-
-#include "WEPSecuritySettingsUiPanic.h"
-
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// Panic()
-// ---------------------------------------------------------
-//
-void Panic( TWepSecuritySettingsPanicCodes aPanic )
-    {
-    _LIT( kWepSet, "WEPSecuritySettingsUi" );
-    User::Panic( kWepSet, aPanic );
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/WepKeyDataTextSettingPage.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of CWEPKeyDataTextSettingPage.
-*
-*/
-
-/*
-* %version: tr1cfwln#11 %
-*/
-
-// INCLUDE FILES
-
-//#include <fepbase.h>
-
-#include <WEPSecuritySettingsUI.rsg>
-
-#include "WepKeyDataTextSettingPage.h"
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWEPKeyDataTextSettingPage::CWEPKeyDataTextSettingPage
-// ---------------------------------------------------------
-//
-CWEPKeyDataTextSettingPage::CWEPKeyDataTextSettingPage( TDes& aText,
-                            TInt aMaxLength, 
-                            CWEPSecuritySettings::TWEPKeyFormat aWEPKeyFormat )
-:CAknTextSettingPage( R_TEXT_SETTING_PAGE_KEY_DATA, aText, 
-                      EAknSettingPageNoOrdinalDisplayed ),
- iLengthOfKeyData( aMaxLength ),
- iWEPKeyFormat( aWEPKeyFormat )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPKeyDataTextSettingPage::ConstructL
-// ---------------------------------------------------------
-//
-void CWEPKeyDataTextSettingPage::ConstructL()
-    {
-    CAknTextSettingPage::ConstructL();
-
-	CEikEdwin* editor = TextControl();
-
-	editor->SetMaxLength( iLengthOfKeyData );
-
-    if ( iWEPKeyFormat == CWEPSecuritySettings::EAscii )
-        {
-        editor->SetOnlyASCIIChars( ETrue );
-    	editor->SetAknEditorCase( EAknEditorLowerCase );
-        }
-    else
-        {
-    	editor->SetAknEditorCase( EAknEditorUpperCase );
-	    editor->SetAknEditorSpecialCharacterTable( 0 );
-        }   
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/wepsecuritysettingsstub.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub implementation of class CWEPSecuritySettings for 
-*              non-WLAN products to support linking 
-*
-*/
-
-/*
-* %version: 3 %
-*/
-
-// INCLUDE FILES
-
-#include <WEPSecuritySettingsUI.h>
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CWEPSecuritySettings* CWEPSecuritySettings::NewL()
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::~CWEPSecuritySettings
-// ---------------------------------------------------------
-//
-EXPORT_C CWEPSecuritySettings::~CWEPSecuritySettings()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::LoadL( TUint32 /* aIapId */, 
-                                           CCommsDatabase& /* aCommsDb */ )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::SaveL( TUint32 /* aIapId */, 
-                                           CCommsDatabase& /* aCommsDb */ ) const
-    {
-    }
-    
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::EditL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWEPSecuritySettings::EditL( CWEPSecuritySettingsUi& /* aUi */,
-                                           const TDesC& /* aTitle */ )
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::IsValid
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CWEPSecuritySettings::IsValid() const
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SetKeyDataL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWEPSecuritySettings::SetKeyDataL( const TInt /* aElement */,
-                                                 const TDesC& /* aKeyData */,
-                                                 const TBool /* aHex */ )
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::LoadL( TUint32 /* aIapId */, 
-                                           CMDBSession& /* aSession */ )
-    {
-    }
-    
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::SaveL( TUint32 /* aIapId */, 
-                                           CMDBSession& /* aSession */ ) const
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SetKeyInUse
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::SetKeyInUse( 
-                                      CWEPSecuritySettings::TWEPKeyInUse /* aKey */ )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettings::SetAuthentication
-// ---------------------------------------------------------
-//
-EXPORT_C void CWEPSecuritySettings::SetAuthentication( 
-                     CWEPSecuritySettings::TWEPAuthentication /* aAuthentication */ )
-    {
-    }
-
-// End of File
--- a/wlansecuritysettings/wepsecuritysettingsui/src/wepsecuritysettingsuistub.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub implementation of class CWEPSecuritySettingsUi for 
-*              non-WLAN products to support linking 
-*
-*/
-
-/*
-* %version: 3 %
-*/
-
-// INCLUDE FILES
-
-#include <WEPSecuritySettingsUI.h>
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUi::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CWEPSecuritySettingsUi* CWEPSecuritySettingsUi::NewL( 
-                                                        CEikonEnv& /* aEikEnv */ )
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUi::~CWEPSecuritySettingsUi
-// ---------------------------------------------------------
-//
-EXPORT_C CWEPSecuritySettingsUi::~CWEPSecuritySettingsUi()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CWEPSecuritySettingsUi::Cvt()
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWEPSecuritySettingsUi::Cvt()
-    {
-    return KErrNotSupported;
-    }
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/bwinscw/wifiprotclient_alru.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-EXPORTS
-	??1CWiFiProtUiClient@@UAE@XZ @ 1 NONAME ; CWiFiProtUiClient::~CWiFiProtUiClient(void)
-	?CancelWiFiProt@CWiFiProtUiClient@@QAEXXZ @ 2 NONAME ; void CWiFiProtUiClient::CancelWiFiProt(void)
-	?NewL@CWiFiProtUiClient@@SAPAV1@XZ @ 3 NONAME ; class CWiFiProtUiClient * CWiFiProtUiClient::NewL(void)
-	?StartWiFiProtL@CWiFiProtUiClient@@QAEXABV?$TBuf8@$0CA@@@HAAV?$RArray@K@@AAW4TWiFiReturn@WiFiProt@@AAVTRequestStatus@@@Z @ 4 NONAME ; void CWiFiProtUiClient::StartWiFiProtL(class TBuf8<32> const &, int, class RArray<unsigned long> &, enum WiFiProt::TWiFiReturn &, class TRequestStatus &)
-	?StartWiFiProtSyncL@CWiFiProtUiClient@@QAE?AW4TWiFiReturn@WiFiProt@@ABV?$TBuf8@$0CA@@@HAAV?$RArray@K@@@Z @ 5 NONAME ; enum WiFiProt::TWiFiReturn CWiFiProtUiClient::StartWiFiProtSyncL(class TBuf8<32> const &, int, class RArray<unsigned long> &)
-	?StartWiFiProtConnL@CWiFiProtUiClient@@QAEXABV?$TBuf8@$0CA@@@AAUTWlanProtectedSetupCredentialAttribute@@AAW4TWiFiReturn@WiFiProt@@AAVTRequestStatus@@@Z @ 6 NONAME ; void CWiFiProtUiClient::StartWiFiProtConnL(class TBuf8<32> const &, struct TWlanProtectedSetupCredentialAttribute &, enum WiFiProt::TWiFiReturn &, class TRequestStatus &)
-
--- a/wlansecuritysettings/wifiprotectedsetup/bwinscw/wifiprotpluginu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-EXPORTS
-	?NotifierArray@@YAPAV?$CArrayPtr@VMEikSrvNotifierBase2@@@@XZ @ 1 NONAME ; class CArrayPtr<class MEikSrvNotifierBase2> * NotifierArray(void)
-	?NewL@CWifiProtUiInProcess@@SAPAV1@PAVRCmManagerExt@@@Z @ 2 NONAME ; class CWifiProtUiInProcess * CWifiProtUiInProcess::NewL(class RCmManagerExt *)
-	?StartFromUiL@CWifiProtUiInProcess@@QAE?AW4TWiFiReturn@WiFiProt@@ABV?$TBuf8@$0CA@@@HAAV?$RArray@K@@@Z @ 3 NONAME ; enum WiFiProt::TWiFiReturn CWifiProtUiInProcess::StartFromUiL(class TBuf8<32> const &, int, class RArray<unsigned long> &)
-
--- a/wlansecuritysettings/wifiprotectedsetup/data/wifiprotplugin.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,331 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file contains all the resources for the Connection Ui Utilities Notifier 
-*
-*/
-
-/*
-* %version: tr1cfwln#12 %
-*/
-
-//  RESOURCE IDENTIFIER
-NAME AWPS // 4 letter ID
-
-//  INCLUDES
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-#include <AvkonIcons.hrh>
-#include "wifiprotplugin.hrh"
-#include <wifiprot.loc>
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf="WiFiProtPlugin"; }
-
-
-  
-RESOURCE DIALOG r_wifiprot_configure_auto_dialog
-    {
-    flags = EEikDialogFlagNotifyEsc | EEikDialogFlagCbaButtons | 
-            EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar ;
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationLayout;
-                animation = R_QGN_NOTE_QUERY_ANIM;
-                label = qtn_ntw_conset_quest_wps_configure_auto;
-                };
-            }
-        };
-    }    
-  
-RESOURCE CBA r_softkeys_continue_cancel__continue
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EWiFiSoftkeyContinue; txt = qtn_text_sotkey_continue; },     
-        CBA_BUTTON { id = EAknSoftkeyCancel;     txt = text_softkey_cancel; },
-        CBA_BUTTON { id = EWiFiSoftkeyContinue; txt = qtn_text_sotkey_continue;}
-        };
-    }
-
-RESOURCE CBA r_softkeys_select_cancel__select
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyView; txt = text_softkey_select; },     
-        CBA_BUTTON { id = EAknSoftkeyNo;     txt = text_softkey_cancel; },
-        CBA_BUTTON { id = EAknSoftkeyView; txt = text_softkey_select;}
-        };
-    }
-
-RESOURCE DIALOG r_wifiprot_initiate_easy_setup_dialog
-    {
-    flags = EEikDialogFlagNotifyEsc | EEikDialogFlagCbaButtons | 
-            EEikDialogFlagNoDrag ;
-    buttons = r_softkeys_continue_cancel__continue;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_netw_conset_prmpt_wps_initiate;
-                };
-            },  
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                };
-            }
-        };
-    }
-
-RESOURCE DIALOG r_wifiprot_enter_pin_code_dialog
-    {
-    flags = EEikDialogFlagNotifyEsc | EEikDialogFlagCbaButtons | 
-            EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar ;
-    buttons = r_softkeys_continue_cancel__continue;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationLayout;
-                animation = R_QGN_NOTE_INFO_ANIM;
-                label = qtn_netw_conset_wps_info_enter_pin_code;
-                };
-            }
-        };
-    } 
-
-
-RESOURCE DIALOG r_wifiprot_wait_note
-    {
-    flags = EAknWaitNoteFlags;
-    buttons = R_AVKON_SOFTKEYS_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control= AVKON_NOTE
-                {
-                layout = EWaitLayout;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
-
-    
-RESOURCE DIALOG r_wifiprot_ok_note
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-            EEikDialogFlagCbaButtons | EEikDialogFlagWait;
-    buttons = R_AVKON_SOFTKEYS_EMPTY;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout = EGeneralLayout;
-                animation = R_QGN_NOTE_OK_ANIM;
-                };
-            }
-        };
-    }
-    
-RESOURCE DIALOG r_wifiprot_info_note
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-            EEikDialogFlagCbaButtons | EEikDialogFlagWait;
-    buttons = R_AVKON_SOFTKEYS_EMPTY;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout = EGeneralLayout;
-                animation = R_QGN_NOTE_INFO_ANIM;
-                };
-            }
-        };
-    }    
-
-RESOURCE DIALOG r_wifiprot_error_note
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-            EEikDialogFlagCbaButtons | EEikDialogFlagWait;
-    buttons = R_AVKON_SOFTKEYS_EMPTY;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout = EGeneralLayout;
-                animation = R_QGN_NOTE_ERROR_ANIM;
-                };
-            }
-        };
-    }
-    
-RESOURCE AVKON_LIST_QUERY r_conn_list_query
-    {
-    softkeys = R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT;
-    flags = EEikDialogFlagNotifyEsc;
-
-    items =
-        {
-        AVKON_LIST_QUERY_DLG_LINE
-            {
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                actuallisttype = EAknCtSingleGraphicPopupMenuListBox;
-                listbox = AVKON_LIST_QUERY_LIST
-                    {
-                    flags = EAknListBoxSelectionList;
-                    };
-
-                heading = qtn_netw_conset_wps_prmpt_select_network;
-                };
-            }
-        };
-    }
-
-
-
-RESOURCE TBUF r_qtn_wlan_info_no_networks_found          
-    { 
-    buf = qtn_wlan_info_no_networks_found;
-    }
-
-RESOURCE TBUF r_qtn_netw_conset_wps_detail_select_network          
-    { 
-    buf = qtn_netw_conset_wps_detail_select_network;
-    }
-  
-RESOURCE TBUF r_qtn_netw_conset_wps_msg_pbc          
-    { 
-    buf = qtn_netw_conset_wps_msg_pbc; 
-    }
-    
-RESOURCE TBUF r_qtn_netw_conset_wps_info_enter_pin_code         
-    { 
-    buf = qtn_netw_conset_wps_info_enter_pin_code; 
-    }
-    
-RESOURCE TBUF r_qtn_netw_conset_wps_msg_link_use_pin         
-    { 
-    buf = qtn_netw_conset_wps_msg_link_use_pin; 
-    }    
-    
-RESOURCE TBUF r_qtn_netw_conset_wait_wps_configuring         
-    { 
-    buf = qtn_netw_conset_wait_wps_configuring; 
-    }  
-      
-RESOURCE TBUF r_qtn_netw_conset_conf_wps_one_network_configured         
-    { 
-    buf = qtn_netw_conset_conf_wps_one_network_configured; 
-    }
-    
-RESOURCE TBUF r_qtn_netw_conset_conf_wps_multiple_networks_config         
-    { 
-    buf = qtn_netw_conset_conf_wps_multiple_networks_config; 
-    }
-    
-RESOURCE TBUF r_qtn_netw_conset_conf_wps_no_networks_configured         
-    { 
-    buf = qtn_netw_conset_conf_wps_no_networks_configured; 
-    } 
-
-RESOURCE TBUF r_qtn_err_wlan_sc_config_failed_try_again          
-    { 
-    buf = qtn_err_wlan_sc_config_failed_try_again; 
-    } 
-
-RESOURCE TBUF r_qtn_err_wlan_sc_config_failed           
-    { 
-    buf = qtn_err_wlan_sc_config_failed; 
-    } 
-
-RESOURCE TBUF r_qtn_err_wlan_signal_too_weak           
-    { 
-    buf = qtn_err_wlan_signal_too_weak;
-    } 
-
-RESOURCE TBUF r_qtn_err_wlan_network_not_found            
-    { 
-    buf = qtn_err_wlan_network_not_found; 
-    } 
-
-RESOURCE TBUF r_qtn_err_wlan_sc_config_failed_multiple_pb_sessions            
-    { 
-    buf = qtn_err_wlan_sc_config_failed_multiple_pb_sessions; 
-    } 
-
-RESOURCE TBUF r_qtn_err_wlan_sc_config_failed_rogue_activity             
-    { 
-    buf = qtn_err_wlan_sc_config_failed_rogue_activity; 
-    } 
-
-RESOURCE TBUF r_qtn_err_wlan_sc_config_failed_pin_not_supported             
-    { 
-    buf = qtn_err_wlan_sc_config_failed_pin_not_supported; 
-    } 
-
-RESOURCE TBUF r_qtn_err_wlan_sc_config_failed_pb_not_supported           
-    { 
-    buf = qtn_err_wlan_sc_config_failed_pb_not_supported;
-    } 
-    
-RESOURCE TBUF r_qtn_wlan_info_connection_already_active
-		{
-		buf = qtn_wlan_info_connection_already_active;
-		}
-   
-   
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/eabi/wifiprotclient_alru.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-EXPORTS
-	_ZN17CWiFiProtUiClient14CancelWiFiProtEv @ 1 NONAME
-	_ZN17CWiFiProtUiClient14StartWiFiProtLERK5TBuf8ILi32EEiR6RArrayImERN8WiFiProt11TWiFiReturnER14TRequestStatus @ 2 NONAME
-	_ZN17CWiFiProtUiClient18StartWiFiProtSyncLERK5TBuf8ILi32EEiR6RArrayImE @ 3 NONAME
-	_ZN17CWiFiProtUiClient4NewLEv @ 4 NONAME
-	_ZN17CWiFiProtUiClientD0Ev @ 5 NONAME
-	_ZN17CWiFiProtUiClientD1Ev @ 6 NONAME
-	_ZN17CWiFiProtUiClientD2Ev @ 7 NONAME
-	_ZTI17CWiFiProtUiClient @ 8 NONAME ; #<TI>#
-	_ZTI19CWiFiProtSyncClient @ 9 NONAME ; #<TI>#
-	_ZTV17CWiFiProtUiClient @ 10 NONAME ; #<VT>#
-	_ZTV19CWiFiProtSyncClient @ 11 NONAME ; #<VT>#
-	_ZN17CWiFiProtUiClient18StartWiFiProtConnLERK5TBuf8ILi32EER38TWlanProtectedSetupCredentialAttributeRN8WiFiProt11TWiFiReturnER14TRequestStatus @ 12 NONAME
-
--- a/wlansecuritysettings/wifiprotectedsetup/eabi/wifiprotpluginu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	_Z13NotifierArrayv @ 1 NONAME
-	_ZN20CWifiProtUiInProcess12StartFromUiLERK5TBuf8ILi32EEiR6RArrayImE @ 2 NONAME
-	_ZN20CWifiProtUiInProcess4NewLEP13RCmManagerExt @ 3 NONAME
-	_ZTI19CWiFiProtDlgsPlugin @ 4 NONAME ; #<TI>#
-	_ZTI20CWifiProtUiInProcess @ 5 NONAME ; #<TI>#
-	_ZTI21CWiFiProtActiveRunner @ 6 NONAME ; #<TI>#
-	_ZTV19CWiFiProtDlgsPlugin @ 7 NONAME ; #<VT>#
-	_ZTV20CWifiProtUiInProcess @ 8 NONAME ; #<VT>#
-	_ZTV21CWiFiProtActiveRunner @ 9 NONAME ; #<VT>#
-
--- a/wlansecuritysettings/wifiprotectedsetup/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file provides the information required for building the Wi-Fi Protected Setup Ui. 
-*
-*/
-
-/*
-* %version: tr1cfwln#15 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// export iby files
-
-../rom/WiFiProt.iby                             CORE_MW_LAYER_IBY_EXPORT_PATH(WiFiProt.iby)
-../rom/WiFiProtResources.iby                    LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(WiFiProtResources.iby)
-
-
-// export localised loc file
-../loc/wifiprot.loc                             MW_LAYER_LOC_EXPORT_PATH(wifiprot.loc)
-
-PRJ_MMPFILES
-
-./wifiprotclient.mmp
-./wifiprotplugin.mmp
-// stub implementation for non-WLAN products
-./wifiprotclientstub.mmp
-./wifiprotpluginstub.mmp
-
-PRJ_EXTENSIONS
-
-START EXTENSION s60/mifconv
-OPTION TARGETFILE wifiprot.mif
-OPTION HEADERFILE wifiprot.mbg
-OPTION SOURCES -c8,1 qgn_prop_wlan_bearer 
-END
-
-PRJ_TESTMMPFILES
-
-// End of file
--- a/wlansecuritysettings/wifiprotectedsetup/group/wifiprot_icons.mk	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:  Makefile for icons of WPS UI
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-
-TARGETDIR=$(ZDIR)\resource\apps
-ICONTARGETFILENAME=$(TARGETDIR)\wifiprot.mif
-
-HEADERDIR=\epoc32\include
-HEADERFILENAME=$(HEADERDIR)\wifiprot.mbg
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2, \s60\bitmaps.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-                /c8,1 qgn_prop_wlan_bearer.bmp 
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/wlansecuritysettings/wifiprotectedsetup/group/wifiprotclient.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is project specification file for the ConnectionUiUtilities. 
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET      wifiprotclient.dll
-TARGETTYPE  DLL
-
-CAPABILITY CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-
-SOURCEPATH ../src
-SOURCE wifiprotuiclient.cpp
-SOURCE wifiprotsession.cpp
-SOURCE wifiprotuiclientimpl.cpp
-SOURCE wifiprotactiveresp.cpp
-SOURCE wifiprotsyncclient.cpp
-
-
-// Component specific internal headers 
-USERINCLUDE         ../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-LIBRARY cone.lib
-LIBRARY eikcore.lib
-LIBRARY eikcoctl.lib
-LIBRARY avkon.lib
-LIBRARY eikdlg.lib 
-LIBRARY bafl.lib
-LIBRARY commonengine.lib
-LIBRARY aknskins.lib
-LIBRARY featmgr.lib 
-LIBRARY aknnotify.lib
-LIBRARY ecom.lib
-LIBRARY	aknlayout.lib
-
-LIBRARY flogger.lib
-
-#if defined( ARMCC )
-    DEFFILE ../eabi/wifiprotclient_alr.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/wifiprotclient_alr.def
-#endif
-
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/group/wifiprotclientstub.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Project specification file for stub implementation of
-               WiFiProt UI for non-WLAN products to support linking. 
-*
-*/
-
-/*
-* %version: 1 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET      wifiprotclientstub.dll
-TARGETTYPE  DLL
-
-CAPABILITY CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-
-SOURCEPATH ../src
-SOURCE wifiprotuiclientstub.cpp
-
-// Component specific internal headers 
-USERINCLUDE         ../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-
-
-LIBRARY flogger.lib
-
-#if defined( ARMCC )
-    DEFFILE ../eabi/wifiprotclient_alr.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/wifiprotclient_alr.def
-#endif
-
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/group/wifiprotplugin.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is project specification file for the Wi-Fi Protected Setup Notifier  
-*
-*/
-
-/*
-* %version: tr1cfwln#13 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET      wifiprotplugin.dll
-
-TARGETTYPE  DLL
-
-TARGETPATH  /system/libs
-
-UID         0x101FDFAE 0x10281BC0      
-
-CAPABILITY CAP_GENERAL_DLL 
-
-VENDORID VID_DEFAULT
-
-START RESOURCE ../data/wifiprotplugin.rss
-HEADER
-    TARGETPATH  RESOURCE_FILES_DIR
-    LANGUAGE_IDS
-END     // RESOURCE
-
-SOURCEPATH  ../pluginsrc
-SOURCE      wifiprotplugin.cpp
-SOURCE      wifiprotdlgsplugin.cpp
-SOURCE      wifiprotconfirmationnotedlg.cpp
-SOURCE      wifiprotenterpindlg.cpp
-SOURCE      wifiprotinitiateeasysetupdlg.cpp
-SOURCE      wifiprotselectnetworkdlg.cpp
-SOURCE      wifiprotactiverunner.cpp
-SOURCE      wifiprotuiinprocess.cpp
-
-
-USERINCLUDE         ../plugininc
-
-// Component specific internal headers 
-USERINCLUDE         ../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY     euser.lib
-LIBRARY     eikdlg.lib
-LIBRARY     eiksrv.lib
-LIBRARY     cone.lib
-LIBRARY     eikcore.lib
-LIBRARY     eikcoctl.lib
-LIBRARY     bafl.lib
-LIBRARY     avkon.lib
-LIBRARY     aknskins.lib
-LIBRARY     ecom.lib 
-LIBRARY     eiksrvui.lib
-LIBRARY     aknnotify.lib
-LIBRARY     aknicon.lib
-LIBRARY     egul.lib
-LIBRARY	    aknlayout.lib
-LIBRARY     akncapserverclient.lib
-LIBRARY     featmgr.lib
-LIBRARY     commonengine.lib
-LIBRARY     cmmanager.lib
-LIBRARY     wpasecuritysettingsui.lib
-LIBRARY     wepsecuritysettingsui.lib
-LIBRARY     commsdat.lib
-LIBRARY     charconv.lib
-LIBRARY     flogger.lib
-LIBRARY     efsrv.lib
-LIBRARY     centralrepository.lib
-
-#if defined(ARMCC)
-    DEFFILE ../eabi/wifiprotplugin.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/wifiprotplugin.def
-#endif
-
-
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/group/wifiprotpluginstub.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Project specification file for stub implementation of
-               WiFiProt UI for non-WLAN products to support linking. 
-*
-*/
-
-/*
-* %version: 1 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET      wifiprotpluginstub.dll
-
-TARGETTYPE  DLL
-
-TARGETPATH  /system/libs
-
-UID         0x101FDFAE 0x10281BC0      
-
-CAPABILITY CAP_GENERAL_DLL 
-
-VENDORID VID_DEFAULT
-
-
-SOURCEPATH  ../pluginsrc
-SOURCE      wifiprotpluginstub.cpp
-
-
-USERINCLUDE         ../plugininc
-
-// Component specific internal headers 
-USERINCLUDE         ../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY     euser.lib
-LIBRARY     eiksrv.lib
-
-#if defined(ARMCC)
-    DEFFILE ../eabi/wifiprotplugin.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/wifiprotplugin.def
-#endif
-
-
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/inc/wifiparams.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares the common used constants and types for Wi-Fi Protected Setup. 
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#ifndef T_WIFIPARAMS_H
-#define T_WIFIPARAMS_H
-
-#include <e32base.h>
-#include <wlanmgmtcommon.h>
-#include <wifiprotreturn.h>
-
-namespace WiFiProt
-    {
-    struct TWiFiInputParams
-        {
-        // ssid of the network we want to configure        
-        TWlanSsid iSSid;
-        // a flag to indicate that a connection is needed
-        // when setup is complete
-        TBool iConnectionNeeded;
-        // constructor to initialise input parameters data
-        inline TWiFiInputParams( const TDesC8& aInitBuf,
-                                 const TBool aConnectionNeeded );
-        };
-        
-    const TInt KMaxNumberOfUids = 30; //to be specified    
-    
-    struct TWiFiOutputParams
-        {
-        // returned iapids of the configured connection methods
-        TBuf8<KMaxNumberOfUids*sizeof(TUint32)> iIapIds;
-        // return value, see TWiFiReturn
-        TWiFiReturn iReturn;
-        // constructor to initialise output parameters data
-        inline TWiFiOutputParams( const TDesC8& aInitBuf );
-        };
-        
-    struct TWiFiConnOutputParams
-        {
-        // returned iapids of the configured connection methods
-        TWlanProtectedSetupCredentialAttribute iNetworkSettings;
-        // return value, see TWiFiReturn
-        TWiFiReturn iReturn;
-        // constructor to initialise output parameters data
-        inline TWiFiConnOutputParams(
-            const TWlanProtectedSetupCredentialAttribute& aNetworkSettings );
-        // default constructor            
-        inline TWiFiConnOutputParams( );
-        };        
-    }
-#include "wifiparams.inl"    
-#endif  // T_WIFIPARAMS_H
-
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/inc/wifiparams.inl	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares inline functions for input/output parameter sructures 
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef WIFIPARAMS_INL
-#define WIFIPARAMS_INL
-
-using namespace WiFiProt;
-
-WiFiProt::TWiFiInputParams::TWiFiInputParams(const TDesC8& aInitBuf,
-                                             const TBool aConnectionNeeded):
-    iSSid(aInitBuf),
-    iConnectionNeeded(aConnectionNeeded)
-    {
-       
-    }
-        
-    
-WiFiProt::TWiFiOutputParams::TWiFiOutputParams(const TDesC8& aInitBuf):
-    iIapIds(aInitBuf),
-    iReturn(EWiFiCancel)
-    {
-        
-    }
-
-WiFiProt::TWiFiConnOutputParams::TWiFiConnOutputParams(
-            const TWlanProtectedSetupCredentialAttribute& aNetworkSettings):
-    iNetworkSettings(aNetworkSettings),
-    iReturn(EWiFiCancel)
-    {
-        
-    }
-    
-WiFiProt::TWiFiConnOutputParams::TWiFiConnOutputParams( ):
-    iNetworkSettings( TWlanProtectedSetupCredentialAttribute() ),
-    iReturn(EWiFiCancel)
-    {
-    
-    }
-#endif  // WIFIPARAMS_INL
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/inc/wifiprot.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is a localisation file for Wi-Fi Protected Setup A .loc file is the one and only place where the logical strings to be localised are defined. 
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-//d:Wi-Fi protected Setup initial query dialog. Asks the user if he wants to use easy setup.
-//l:popup_note_window
-//w:
-//r:3.2
-#define qtn_ntw_conset_quest_wps_configure_auto "Selected network supports easy setup for receiving settings. Configure automatically?"
-
-//d:Left softkey text
-//l:control_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_text_sotkey_continue "Continue" 
-
-//d:Wi-Fi protected Setup 'Initiate easy setup' query dialog heading text
-//l:heading_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_prmpt_wps_initiate "Initiate easy setup" 
-
-//d:Wi-Fi protected Setup 'Initiate easy setup' query dialog text
-//l:popup_info_list_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wps_msg_pbc "Push a button on the wireless station to initiate the easy setup process, and select 'Continue'." 
-
-
-//d:Link inside 'Initiate easy setup' to activate 'use PIN code' option
-//l:popup_info_list_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wps_msg_link_use_pin "Use PIN code instead"
-
-//d:Wi-Fi protected Setup dialog to display PIN code that should be entered to wireless station.
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wps_info_enter_pin_code "Enter '%N' on the wireless station and select 'Continue'"
-
-//d:Wi-Fi protected Setup wait note shown during configuring connection
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wait_wps_configuring "Configuring connection..."
-
-//d:Wi-Fi protected Setup ok note shown after successful configuration of a single connection
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_conf_wps_one_network_configured "Settings configured for '%U' network"
-
-//d:Wi-Fi protected Setup ok note shown after successful configuration of multiple connections
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_conf_wps_multiple_networks_config "Settings for multiple networks configured"
-
-//d:Wi-Fi protected Setup ok note shown after unsuccessful configuration of network(s)
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_conf_wps_no_networks_configured "No settings received"
-
-//d:Wi-Fi protected Setup error note show when configuration fails
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_try_again "Configuration failed. Please try again."
-
-//d:Wi-Fi protected Setup error note show when configuration fails and user is requested to try again
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed "Configuration failed."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because signal is too weak
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_signal_too_weak "WLAN signal too weak. Move closer to wireless station."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because WLAN network can't be found
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_network_not_found "Connection failed. Could not find WLAN network."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because multiple push-button sessions
-//d:were detected
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_multiple_pb_sessions "Multiple push-button sessions detected. Wait a moment and try again, or use PIN code mechanism instead."
-
-//d:Wi-Fi protected Setup error note show when configuration fails and user is requested to try again with PIN code
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_rogue_activity "Connection failed. Please try again with PIN code mechanism."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because PIN code mechanism is not supported
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_pin_not_supported "Configuration failed. Device you tried to connect to does not support PIN code mechanism."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because push-button mechanism is not supported
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_pb_not_supported "Configuration failed. Device you tried to connect to does not support push-button mechanism."
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/inc/wifiprotactiveresp.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: CWiFiProtActiveResp class
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#ifndef C_WIFIPROTACTIVERESP_H
-#define C_WIFIPROTACTIVERESP_H
-
-// INCLUDES
-#include <e32base.h>
-#include "wifiparams.h"
-
-// CLASS DECLARATION
-
-/**
-* ActiveObject for asynchronous operations
-*/
-NONSHARABLE_CLASS( CWiFiProtActiveResp ) : public CActive
-    {
-    public:  // Constructors and destructor
-        /**
-        * Two-phased constructor.
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aConnectionNeeded ETrue if we need a connection
-        * via the configured network 
-        * @param aUidsReturned uids of the configured connection methods
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use 
-        * protected setup (No Automatic Setup).
-        */
-        static CWiFiProtActiveResp* NewL(   const TWlanSsid& aSSid,
-             TBool aConnectionNeeded, RArray<TUint32>& aUidsReturned, 
-             WiFiProt::TWiFiReturn& aReturnValue );
-             
-        /**
-        * Two-phased constructor.
-        * @param aSSid contains SSid of the network we want to configure 
-        * via the configured network 
-        * @param aNetworkSettings the configured network settings
-        * to be returned
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use 
-        * protected setup (No Automatic Setup).
-        */
-        static CWiFiProtActiveResp* NewL(   const TWlanSsid& aSSid,
-             TWlanProtectedSetupCredentialAttribute& aNetworkSettings, 
-             WiFiProt::TWiFiReturn& aReturnValue );             
-
-        /**
-        * Destructor.
-        */
-        virtual ~CWiFiProtActiveResp();
-
-    public: // From base class
-        /**
-        * This function is called when the scheduled function ends.
-        */
-        void RunL();
-
-        /**
-        * Cancel operations.
-        */
-        void DoCancel();
-
-
-    public: // New functions
-        /**
-        * Add this class on the ActiveScheduler and puts itself active.
-        * @param aStatus The status that is checked by the caller of the 
-        *                Authenticate dialog.
-        */
-        void Observe( TRequestStatus &aStatus );
-
-        /**
-        * Returns the TWiFiInputParams 
-        * @return A pointer to iWiFiInputParams.
-        */
-        TPckgBuf<WiFiProt::TWiFiInputParams>* InputBuffer();
-
-        /**
-        * Returns the TWiFiOutputParams 
-        * @return A pointer to iWiFiOutputParams.
-        */
-        TPckgBuf<WiFiProt::TWiFiOutputParams>* OutputBuffer();
-        
-        /**
-        * Returns the TWiFiConnOutputParams 
-        * @return A pointer to iConnWiFiOutputParams.
-        */
-        TPckgBuf<WiFiProt::TWiFiConnOutputParams>* ConnOutputBuffer();         
-
-    private:
-        /**
-        * C++ default constructor.
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aConnectionNeeded ETrue if we need a connection via the
-        * configured network 
-        * @param aUidsReturned uids of the configured connection methods
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use 
-        * protected setup (No Automatic Setup).
-        */
-        CWiFiProtActiveResp(   const TWlanSsid& aSSid,
-             TBool aConnectionNeeded, RArray<TUint32>& aUidsReturned,
-             WiFiProt::TWiFiReturn& aReturnValue );
-             
-        /**
-        * C++ default constructor.
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aNetworkSettings network settings to be returned
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use 
-        * protected setup (No Automatic Setup).
-        */
-        CWiFiProtActiveResp(   const TWlanSsid& aSSid,
-             TWlanProtectedSetupCredentialAttribute& aNetworkSettings,
-             WiFiProt::TWiFiReturn& aReturnValue );
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL( );
-
-    private:    // Data
-        // The status that is checked by the caller of the Wi-Fi
-        // Protected Setup ui. Not owned.
-        TRequestStatus* iRequestStatus;    
-
-        // The address of the area where the caller of the Wi-Fi
-        // Protected Setup ui expects the value for iap list. Not owned.
-        RArray<TUint32>* iIapIds;
-        
-        //Contains the return value passed to the client
-        WiFiProt::TWiFiReturn& iReturnValue;
-
-        // Packed buffer containing Wi-Fi Protected Setup output parameters.
-        TPckgBuf<WiFiProt::TWiFiOutputParams> iWiFiOutputParams;
-        // Packed buffer containing Wi-Fi Protected Setup input parameters.
-        TPckgBuf<WiFiProt::TWiFiInputParams> iWiFiInputParams;
-        // Packed buffer containing Wi-Fi Protected Setup output parameters
-        // for connection creation mode.
-        TPckgBuf<WiFiProt::TWiFiConnOutputParams> iWiFiConnOutputParams;
-        // network settings to be returned
-        // used only for connection creation
-        TWlanProtectedSetupCredentialAttribute* iNetworkSettings;
-    };
-
-
-#endif //C_WIFIPROTACTIVERESP_H
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/inc/wifiprotlogger.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Definition of macros used for logging 
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#ifndef WIFIPROTLOGGER_H_INCLUDED
-#define WIFIPROTLOGGER_H_INCLUDED
-
-// ========== INCLUDE FILES ================================
-
-#include <eikenv.h>
-#include <flogger.h>
-
-#ifdef _DEBUG
-
-// Format string: enter function.
-_LIT( KCCDLGLogEnterFn,           "-> %S" );
-// Format string: leave function.
-_LIT( KCCDLGLogLeaveFn,           "<- %S" );
-// Format string: time.
-_LIT( KCCDLGLogTimeFormatString,  "%H:%T:%S:%*C2" );
-
-// Logging directory.
-_LIT( KCCDLGLogDir,               "wps" );
-// Log file name.
-_LIT( KCCDLGLogFile,              "wps.txt" );
-_LIT( KCCDLGLogBanner,            "****************\n\nWiFiProtectedSetupUi\n\n****************" );
-_LIT( KCCDLGLogExit,              "WiFiProtectedSetupUi: Exit" );
-
-#define CLOG_CREATE             {FCreate();}
-#define CLOG_DELETE             {RFileLogger::Write(KCCDLGLogDir, KCCDLGLogFile, EFileLoggingModeAppend, KCCDLGLogExit);}
-#define CLOG_ENTERFN(a)         {_LIT(temp, a); RFileLogger::WriteFormat(KCCDLGLogDir, KCCDLGLogFile, EFileLoggingModeAppend, KCCDLGLogEnterFn, &temp);}
-#define CLOG_LEAVEFN(a)         {_LIT(temp, a); RFileLogger::WriteFormat(KCCDLGLogDir, KCCDLGLogFile, EFileLoggingModeAppend, KCCDLGLogLeaveFn, &temp);}
-#define CLOG_WRITE(a)           {_LIT(temp, a); RFileLogger::Write(KCCDLGLogDir, KCCDLGLogFile, EFileLoggingModeAppend, temp);}
-#define CLOG_WRITE_TIMESTAMP(a) {_LIT(temp, a); TTime time; time.HomeTime(); TBuf<256> buffer; time.FormatL( buffer, KCCDLGLogTimeFormatString ); buffer.Insert(0, temp); RFileLogger::Write(KCCDLGLogDir, KCCDLGLogFile, EFileLoggingModeAppend, buffer); }
-#define CLOG_WRITEF             FPrint
-
-// ---------------------------------------------------------
-// FPrint
-// ---------------------------------------------------------
-//
-inline void FPrint(const TRefByValue<const TDesC> aFmt, ...)
-    {
-    VA_LIST list;
-    VA_START(list,aFmt);
-    RFileLogger::WriteFormat(KCCDLGLogDir, KCCDLGLogFile, EFileLoggingModeAppend, aFmt, list);
-    }
-
-// ---------------------------------------------------------
-// FPrint
-// ---------------------------------------------------------
-//
-inline void FPrint(const TDesC& aDes)
-    {
-    RFileLogger::WriteFormat(KCCDLGLogDir, KCCDLGLogFile, EFileLoggingModeAppend, aDes);
-    }
-
-// ---------------------------------------------------------
-// FHex
-// ---------------------------------------------------------
-//
-inline void FHex(const TUint8* aPtr, TInt aLen)
-    {
-    RFileLogger::HexDump(KCCDLGLogDir, KCCDLGLogFile, EFileLoggingModeAppend, 0, 0, aPtr, aLen);
-    }
-
-// ---------------------------------------------------------
-// FHex
-// ---------------------------------------------------------
-//
-inline void FHex(const TDesC8& aDes)
-    {
-    FHex(aDes.Ptr(), aDes.Length());
-    }
-
-// ---------------------------------------------------------
-// FCreate
-// ---------------------------------------------------------
-//
-inline void FCreate()
-    {
-    TFileName path( _L( "c:\\logs\\" ) );
-    path.Append( KCCDLGLogDir );
-    path.Append( _L( "\\" ) );
-    RFs& fs = CEikonEnv::Static()->FsSession();
-    fs.MkDirAll( path );
-    RFileLogger::WriteFormat( KCCDLGLogDir, KCCDLGLogFile, 
-                              EFileLoggingModeAppend, KCCDLGLogBanner );
-    }
-
-#else // ! _DEBUG
-
-// ---------------------------------------------------------
-// FPrint
-// ---------------------------------------------------------
-//
-inline void FPrint(const TRefByValue<const TDesC> /*aFmt*/, ...) { };
-
-#define CLOG_CREATE
-#define CLOG_DELETE
-#define CLOG_ENTERFN(a)
-#define CLOG_LEAVEFN(a)
-#define CLOG_WRITE(a)
-#define CLOG_WRITEF   1 ? ((void)0) : FPrint
-#define CLOG_WRITE_TIMESTAMP(a)
-
-#endif // _DEBUG
-
-
-#endif // WIFIPROTLOGGER_H_INCLUDED
--- a/wlansecuritysettings/wifiprotectedsetup/inc/wifiprotsession.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: RWiFiProtSession class.
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#ifndef R_WIFIPROTSESSION_H
-#define R_WIFIPROTSESSION_H
-
-// INCLUDES
-#include <e32std.h>
-
-#include "wifiparams.h"
-#include "wifiprotactiveresp.h"
-
-// CLASS DECLARATION
-
-/**
- * RWiFiProtSession
- * Session class to handle communication with Notifier Framework
- */
-class RWiFiProtSession : public RSessionBase
-    {
-    public:
-    
-        /**
-        * Constructor.
-        */
-        RWiFiProtSession();
-
-        /**
-        * Destructor.
-        */
-        ~RWiFiProtSession();
-
-        /**
-        * Connect to the notifier server. Must be called before any other 
-        * function.
-        * @return KErrNone if connection succeeded and a standard error code
-        * otherwise.
-        */
-        TInt Connect();
-
-        /**
-        * Disconnect from the notifier server.
-        */
-        void Close();
-
-        /**
-        * Starts WiFi Protected Setup sequence
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aConnectionNeeded not used anymore 
-        * @param aUidsReturned uids of the configured connection methods
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use protected setup (No Automatic Setup).
-        * @param aStatus - Request status of the client
-        */      
-        void StartWiFiProtL( const TWlanSsid& aSSid, TBool aConnectionNeeded,
-            RArray<TUint32>& aUidsReturned,
-            WiFiProt::TWiFiReturn& aReturnValue,
-             TRequestStatus& aStatus );
-             
-        /**
-        * Starts WiFi Protected Setup sequence in Connection initiation mode
-        * (WPS phase 2 implementation)
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aNetworkSettings configuration settings of the network to use
-        * for the connection (returned as the result of Protected Setup)      
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use protected setup (No Automatic Setup).
-        * @param aStatus - Request status of the client       
-        */
-        void StartWiFiProtConnL( const TWlanSsid& aSSid,
-                                      TWlanProtectedSetupCredentialAttribute&
-                                        aNetworkSettings,
-                                      WiFiProt::TWiFiReturn& aReturnValue,
-                                      TRequestStatus& aStatus );        
-        /**
-        * Cancels WiFi Protected Setup sequence
-        */
-        void CancelWiFiProt();
-
-    private:
-        // Pointer to the client interface
-        RNotifier* iNotifier;
-        // Active object used to get TDesC data from the Notifier Framework
-        //  message
-        CWiFiProtActiveResp* iWiFiProtActiveResp;
-    };
-
-#endif /* R_WIFIPROTSESSION_H */
-
-// End of File
-
--- a/wlansecuritysettings/wifiprotectedsetup/inc/wifiprotsyncclient.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: CWiFiProtSyncClient class.
-*
-*/
-
-/*
-* %version: tr1cfwln#6 %
-*/
-
-#ifndef C_WIFIPROTSYNCCLIENT_H
-#define C_WIFIPROTSYNCCLIENT_H
-
-// INCLUDES
-#include <e32base.h>
-
-#include "wifiprotsession.h"
-
-/**
-* CWiFiProtSyncClient
-* Active object to convert a sychronous client call asynchronous, and
-* return only when the request is completed
-*/
-class CWiFiProtSyncClient : public CActive
-    {
-    public:
-        /**
-        * Two phased constructor
-        * @param aClient RWiFiProtSession class to handle communication with
-        * Notifier Framework
-        * @param aPriority Active object priority
-        **/
-        static CWiFiProtSyncClient* NewL( RWiFiProtSession& aClient,
-            TInt aPriority = CActive::EPriorityStandard );
-        /**
-        * Destructor
-        **/            
-        ~CWiFiProtSyncClient();
-
-        /**
-        * Starts WiFi Protected Setup sequence
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aConnectionNeeded ETrue if we need a connection via the
-        * configured network 
-        * @param aUidsReturned uids of the configured connection methods
-        * @return possible return values are ok, cancel process and not use 
-        * protected setup (No Automatic Setup).
-        */
-        WiFiProt::TWiFiReturn StartWiFiProtL(  const TWlanSsid& aSSid, 
-                                  TBool aConnectionNeeded,
-                                  RArray<TUint32>& aUidsReturned
-                                  );
-        
-    private:
-        // Each Notifier Framework call has a corresponding enum,
-        // and CWiFiProtSyncClient uses it to keep track of the
-        // currently active call
-        // The only one is ERunWiFiProt at the moment
-        enum TWiFiState
-            {
-            ENoState = 0,
-            // StartWiFiProtL was called
-            ERunWiFiProt
-            };
-
-    private:
-        /**
-        * Constructor
-        * @param aClient RWiFiProtSession class to handle communication
-        * with Notifier Framework
-        * @param aPriority Active object priority
-        **/    
-        CWiFiProtSyncClient( RWiFiProtSession& aClient, TInt aPriority );
-        
-        /**
-        * Second phase constructor
-        **/           
-        void ConstructL();
-        
-        /**
-        * Calls CActive::SetActive() and sets TWiFiState also
-        * @param aState identifier of the active call
-        **/           
-        void SetActive( TWiFiState aState );
-
-        /** From CActive */
-        
-        /**
-        * @see CActive::DoCancel
-        **/ 
-        virtual void DoCancel();
- 
-        /**
-        * @see CActive::RunL
-        **/        
-        virtual void RunL();
-
-    private:
-        // RWiFiProtSession class to handle communication with Notifier
-        // Framework
-        RWiFiProtSession& iClient;
-        // identifier of the active call
-        CWiFiProtSyncClient::TWiFiState iState;
-        // Active Scheduler Waiter class to halt the process until the
-        // call is completed
-        CActiveSchedulerWait iWait;
-    };
-
-
-#endif //C_WIFIPROTSYNCCLIENT_H
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/inc/wifiprotuiclientimpl.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class CWiFiProtUiClientImpl.  
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#ifndef C_WIFIPROTUICLIENTIMPL_H
-#define C_WIFIPROTUICLIENTIMPL_H
-
-// INCLUDES
-#include <e32base.h>
-#include <wifiprotuiclient.h>
-
-#include "wifiparams.h"
-#include "wifiprotsyncclient.h"
-
-// FORWARD DECLARATIONS
-class CCommsDatabase;
-class TConnectionPrefs;
-class CAknGlobalNote;
-
-
-// CLASS DECLARATION
-
-/**
-* Wi-Fi Protected Setup.
-* Implementation behind proxy class CWiFiProt.
-*/
-NONSHARABLE_CLASS( CWiFiProtUiClientImpl ) : public CBase
-    {
-    public:
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @return The constructed CConnectionUiUtilities object.
-        */
-        static CWiFiProtUiClientImpl* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CWiFiProtUiClientImpl();
-
-    public:
-        /**
-        * Starts WiFi Protected Setup sequence - async version
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aConnectionNeeded not used anymore
-        * @param aUidsReturned uids of the configured connection methods
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use 
-        * protected setup (No Automatic Setup).
-        */
-        void StartWiFiProtL ( const TWlanSsid& aSSid,
-         TBool aConnectionNeeded, RArray<TUint32>& aUidsReturned,
-          WiFiProt::TWiFiReturn& aReturnValue, TRequestStatus& aStatus );
-        
-        /**
-        * Starts WiFi Protected Setup sequence - sync version, returns
-        * when completed
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aConnectionNeeded not used anymore 
-        * @param aUidsReturned uids of the configured connection methods
-        * @return  possible return values are ok, cancel process and not use 
-        * protected setup (No Automatic Setup).
-        * We can return a value since the call is sychronous.
-        */
-        WiFiProt::TWiFiReturn StartWiFiProtSyncL( const TWlanSsid& aSSid,
-                                                 TBool aConnectionNeeded,
-                                          RArray<TUint32>& aUidsReturned );
-        
-        /**
-        * Starts WiFi Protected Setup sequence in Connection initiation mode
-        * (WPS phase 2 implementation)
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aNetworkSettings configuration settings of the network to use
-        * for the connection (returned as the result of Protected Setup)      
-        * @param aReturnValue - possible return values are ok, cancel
-        * process and not use protected setup (No Automatic Setup).
-        * @param aStatus - Request status of the client       
-        */
-        void StartWiFiProtConnL( const TWlanSsid& aSSid,
-                                      TWlanProtectedSetupCredentialAttribute&
-                                        aNetworkSettings,
-                                      WiFiProt::TWiFiReturn& aReturnValue,
-                                      TRequestStatus& aStatus );
-
-        /**
-        * Cancels WiFi Protected Setup sequence
-        */
-        void CancelWiFiProt( );        
-
-    private:  // Constructors
-
-        /**
-        * Constructor.
-        */
-        CWiFiProtUiClientImpl();
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-  
-                                  
-    // Data
-    private:     
-        // notifier client
-        RWiFiProtSession iNotif; 
-        // Synchronously callable client
-        CWiFiProtSyncClient* iWiFiProtSyncClient;
-    };
-
-
-#endif  // C_WIFIPROTUICLIENTIMPL_H
-
-// End of File
-
--- a/wlansecuritysettings/wifiprotectedsetup/loc/wifiprot.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is a localisation file for Wi-Fi Protected Setup A .loc file is the one and only place where the logical strings to be localised are defined. 
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-//d:Wi-Fi protected Setup initial query dialog. Asks the user if he wants to use easy setup.
-//l:popup_note_window
-//w:
-//r:3.2
-#define qtn_ntw_conset_quest_wps_configure_auto "Selected network supports easy setup for receiving settings. Configure automatically?"
-
-//d:Left softkey text
-//l:control_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_text_sotkey_continue "Continue" 
-
-//d:Wi-Fi protected Setup 'Initiate easy setup' query dialog heading text
-//l:heading_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_prmpt_wps_initiate "Initiate easy setup" 
-
-//d:Wi-Fi protected Setup 'Initiate easy setup' query dialog text
-//l:popup_info_list_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wps_msg_pbc "Push a button on the wireless station to initiate the easy setup process, and select 'Continue'." 
-
-
-//d:Link inside 'Initiate easy setup' to activate 'use PIN code' option
-//l:popup_info_list_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wps_msg_link_use_pin "Use PIN code instead"
-
-//d:Wi-Fi protected Setup dialog to display PIN code that should be entered to wireless station.
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wps_info_enter_pin_code "Enter '%N' on the wireless station and select 'Continue'"
-
-//d:Wi-Fi protected Setup 'Select Network' query dialog heading text
-//l:heading_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_netw_conset_wps_prmpt_select_network "Select network:"
-
-//d:Wi-Fi protected Setup 'Select Network' query dialog description text
-//l:loc_type_pane
-//w:
-//r:5.0
-//
-#define qtn_netw_conset_wps_detail_select_network "Settings for multiple networks received. Select the network to connect to:"
-
-//d:Wi-Fi protected Setup wait note shown during configuring connection
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wait_wps_configuring "Configuring connection..."
-
-//d:Wi-Fi protected Setup ok note shown after successful configuration of a single connection
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_conf_wps_one_network_configured "Settings configured for '%U' network"
-
-//d:Wi-Fi protected Setup ok note shown after successful configuration of multiple connections
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_conf_wps_multiple_networks_config "Settings for multiple networks configured"
-
-//d:Wi-Fi protected Setup ok note shown after unsuccessful configuration of network(s)
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_conf_wps_no_networks_configured "No settings received"
-
-//d:"Search for WLAN" - information note
-//l:popup_note_window
-//w:
-//r:5.0
-//
-#define qtn_wlan_info_no_networks_found         "No WLAN networks found"
-
-
-//d:Wi-Fi protected Setup error note show when configuration fails
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_try_again "Configuration failed. Please try again."
-
-//d:Wi-Fi protected Setup error note show when configuration fails and user is requested to try again
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed "Configuration failed."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because signal is too weak
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_signal_too_weak "WLAN signal too weak. Move closer to wireless station."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because WLAN network can't be found
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_network_not_found "Connection failed. Could not find WLAN network."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because multiple push-button sessions
-//d:were detected
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_multiple_pb_sessions "Multiple push-button sessions detected. Wait a moment and try again, or use PIN code mechanism instead."
-
-//d:Wi-Fi protected Setup error note show when configuration fails and user is requested to try again with PIN code
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_rogue_activity "Connection failed. Please try again with PIN code mechanism."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because PIN code mechanism is not supported
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_pin_not_supported "Configuration failed. Device you tried to connect to does not support PIN code mechanism."
-
-//d:Wi-Fi protected Setup error note show when configuration fails because push-button mechanism is not supported
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_err_wlan_sc_config_failed_pb_not_supported "Configuration failed. Device you tried to connect to does not support push-button mechanism."
-
-//d:Wi-Fi protected Setup error note show when WLAN connection already exists
-//l:popup_note_window/opt1
-//w:
-//r:3.2
-//
-#define qtn_wlan_info_connection_already_active "A WLAN connection is already active. Close connection and try again."
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotactiverunner.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,507 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implements a state - machine like active object that controls Wi-Fi Protected Setup Process. 
-*
-*/
-
-/*
-* %version: tr1cfwln#16 %
-*/
-
-#ifndef C_WIFIPROTACTIVERUNNER_H
-#define C_WIFIPROTACTIVERUNNER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <cmmanagerext.h>
-#include <AknQueryDialog.h>
-#include <AknProgressDialog.h>
-
-#include "wifiprotdlgsplugin.h"
-#include "wifiparams.h"
-#include "wifiprotactiverunnercallback.h"
-
-
-//FORWARD DECLARATIONS
-class CWlanMgmtClient;
-class CMDBSession;
-class CWiFiProtConfirmationNoteDlg;
-class CWiFiProtInitiateEasySetupDlg;
-class CWlanScanInfo;
-class CWiFiProtEnterPinDlg;
-class CWEPSecuritySettings;
-class RCmConnectionMethodExt;
-
-//CONSTS
-const TInt KMaxPINLength = 8; //is it really 8?
-// ID of OfflineWlanNote dialog
-const TUid KUidCOfflineWlanNoteDlg = { 0x101FD671 };
-
-/**
-* CWiFiProtActiveRunner
-* State machine like object that manages Wi-Fi Protected setup ui process
-* @since S60 v3.2
-*/
-class CWiFiProtActiveRunner : public CActive, public MProgressDialogCallback,
-                                                     MActiveRunnerCallback
-    {
-    private:
-    // States to control Wi-Fi Protected Setup sequence
-        enum TWiFiProtStates
-            {
-            // Display 'Configure Automatically?' Dialog
-            EWiFiProtAskConfigureAutomatically = 1,  
-            // Display 'Initiate Easy Setup?' Dialog            
-            EWiFiProtInitiateEasySetup,
-            // If phone is in offline mode, continue with
-            // "Create WLAN connection in offline mode?" confirmation
-            EWifiProtOfflineQuery,
-            // Display 'Enter PIN code' Dialog
-            EWiFiProtUsePinCode,
-            // Starting wait dialog
-            EWiFiProtStartingWaitDlg,
-            // Configuring (Creating temp iap and making a call to wlan
-            // mgmt server )
-            EWiFiProtConfiguring,
-            // Wlan Mgmt server returned
-            EWiFiProtWlanMgmtEngineReturned,
-            // Creating iap from parameters from wlan mgmt server
-            EWiFiProtCreateAllIaps,
-            // Configuration finished
-            EWiFiProtConfFinished,
-            // Destroying wait note
-            EWiFiProtDestroyWaitNote,            
-            // Waiting for PIN query to exit
-            EWiFiProtWaitForPINQuery,            
-            // Wlan Scan
-            EWiFiProtWlanScan,
-            // Displaying Select Connection Dialog
-            EWiFiProtSelectConnection,
-            // Displaying final note about configured settings
-            EWiFiProtSettingsConfNote,
-            // Finished, exiting
-            EWiFiProtFinished,
-            // Cancelled, exiting
-            EWiFiProtCancelled
-            };
-            
-    // Asynchronous service to cancel
-        enum TWiFiProtOutstandingRequest
-            {
-            EWiFiProtReqNone = 0,
-            EWiFiProtReqConfirmDialog,
-            EWiFiProtReqInitDialog,
-            EWiFiProtReqWPS,
-            EWiFiProtReqWlanScan           
-            };
-            
-    public:
-        /**
-        * Two phased constructor
-        * @param aPriority Active object priority
-        */    
-        static CWiFiProtActiveRunner* NewL( CWiFiProtDlgsPlugin* aParent,
-                TInt aPriority = CActive::EPriorityStandard  );
-        
-        /**
-        * Destructor
-        */    
-        ~CWiFiProtActiveRunner();
-
-        
-        /**
-        * Starts Wi-Fi Protected Setup
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aCmManagerToUse - RCmManagerExt to use. Must pass this 
-        * to avoid CmManager database
-        * locking problems    
-        */    
-        void StartProtectedSetupAsyncL (  const TWlanSsid& aSSid,
-                                                      RArray<TUint32>& aUids,
-                                            RCmManagerExt& aCmManagerToUse );
-
-        /**
-        * Starts Wi-Fi Protected Setup in Connection creation mode
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aNetworkSettings the configured network's settings to be
-        * returned 
-        * @param aCmManagerToUse - RCmManagerExt to use. Must pass this 
-        * to avoid CmManager database
-        * locking problems
-        * @return  possible return values are ok, cancel process and not use 
-        * protected setup (No Automatic Setup).        
-        */                                                
-        void StartProtectedSetupConnL (
-                                     const TWlanSsid& aSSid,
-                                     TWlanProtectedSetupCredentialAttribute&
-                                          aNetworkSettings,
-                                     RCmManagerExt& aCmManagerToUse );
-        
-        /**
-        * Starts Wi-Fi Protected Setup using CActiveSchedulerWait block
-        * @param aSSid contains SSid of the network we want to configure 
-        * @param aCmManagerToUse - RCmManagerExt to use. Must pass this 
-        * to avoid CmManager database
-        * locking problems
-        * @return  possible return values are ok, cancel process and not use 
-        * protected setup (No Automatic Setup).        
-        */    
-        WiFiProt::TWiFiReturn StartProtectedSetupL (  const TWlanSsid& aSSid,
-                                                      RArray<TUint32>& aUids,
-                                            RCmManagerExt& aCmManagerToUse );
-        
-        /**
-         * When the process is cancelled by the client rather than
-         * cancelled by the user, some things are taken care of
-         * a bit differently.
-         */
-        void CancelByClient();
-        
-    private:
-
-
-        /**
-        * Shows the first dialog in the sequence
-        */
-        void ShowInitialDialogL (); 
-        /**
-         * Shows connect in offline -notification.
-         */
-        void ShowOfflineQuery ();
-         /**
-        * Shows the Initiate Easy Setup dialog
-        */
-        void ShowInitiateEasySetupDialogL (); 
-           
-         /**
-        * Shows the 'Enter PIN on Wireless Station' dialog
-        */    
-        void ShowEnterPinOnStationDialogL();
-
-        /**
-        * Shows waiting dialog
-        */     
-        void ShowWaitingDialogL();
-        
-        /**
-        * Shows waiting dialog and proceeds with the process
-        */     
-        void ShowWaitingDialogAndProceedL();
-        
-        /**
-        * Shows 'settings configured' dialog
-        * @param aWiFiProtState state to decide which note to display
-        */     
-        void ShowFinalNoteL();
-        
-        /**
-        * wait note callback
-        */
-        void DialogDismissedL( TInt aButtonId );
-
-        /**
-        * Creates Temporary iap (cm) which contains parameters to be passed
-        * to wlan engine
-        * @param aTempServId Temporary iap service id          
-        * @return TUint32 iap id (cm uid)
-        */    
-        TUint32 CreateTempIapL( TUint32& aTempServId );
-
-        /**
-        * Calls the active object that calls wlan engine's RunProtectedSetup
-        * @param TUint32 aIap iap id (cm uid)
-        */   
-        void RunProtectedSetup( const TInt32 aIap );    
-
-        /**
-        * Constructor
-        * @param aParent Parent object
-        * @param aPriority Active object priority
-        */
-        CWiFiProtActiveRunner( CWiFiProtDlgsPlugin* aParent, TInt aPriority );
-        
-        /**
-        * Second phase constructor
-        */
-        void ConstructL();
-
-        /** From CActive */
-        /**
-        @see CActive::DoCancel
-        */    
-        virtual void DoCancel();
-        
-        /**
-        @see CActive::RunL
-        */        
-        virtual void RunL();
-
-        
-        /**
-        * Sets iNextWiFiProtState and completes the pending request
-        * used to step forward in the 'state machine'
-        * @param aNextState - the state to step to
-        */
-        void SetNextStateAndComplete( TWiFiProtStates aNextState,
-                                      TInt aError = KErrNone );
-        
-        /**
-        * Called from RunL in EWiFiProtConfiguring state
-        * Starts configuring the connection methods
-        */
-        void ConfigureL();
-
-        /**
-        * Proceeds after DestroyWaitDialog or after PinQueryExitL and
-        * checks error state and continues with Wlan availability 
-        * scan if needed
-        */
-        void EvaluateResult();
-        
-        /**
-        * Called from RunL in EWiFiProtConfFinished state
-        * Destroys the wait dialog as configuring is complete
-        */
-        void DestroyWaitDialog();
- 
-        /*
-        * Computes checksum number which is the last number of
-        * the 8 digit PIN code passed to wlan mgmt engine
-        * algorythm copied from Wi-Fi spec
-        * @param aPin Pin code
-        * @return last digit, to be appended to PIN
-        */       
-        TInt ComputeChecksum(TInt aPin);
-
-        /*
-        * Creates a single iap (from the first network's parameters),
-        * and then repeats the process for each iap
-        * The iap parameters at 0 index (in iIapParametersArray) will be
-        * used to create an iap. passed to CreateIapL.
-        */       
-        void CreateAllIapsL();
-        
-        /**
-        * Creates Connection Method using RCmManagerExt
-        * The iap parameters at the given index (in iIapParametersArray)
-        * will be used to create an iap. Then the parameters entry will
-        * be deleted from iIapParametersArray
-        * and the new iap's id will be added to iCmArray.
-        * @param TInt aIndex index of the connection method (iap) to create
-        * in iIapParametersArray
-        * @return IapId of the cm
-        */
-        TUint32 CreateIapL( const TInt aIndex );
-        
-        /**
-        * Sets iap settings to a given connection method object and saves it
-        * @param TInt aIndex index of the connection method (iap) 
-        * in iIapParametersArray
-        * @param aCmToSet target connection method object 
-        * @return IapId of the cm
-        */        
-        TUint32 SetIapDataL( const TInt aIndex, RCmConnectionMethodExt& aCmToSet );
-
-        // calls DeleteTempIapL, and also steps the state machine
-        void CleanupTempIapL();        
-
-        /**
-        * Deletes temporary iap
-        */
-        void DeleteTempIapL();
-
-        /**
-        * Returns wep format, ETrue if it is in hex
-        * @param aLength Wep key length
-        */
-        TBool IsWepFormatHexL( TInt aLength );
-
-        /**
-        * Saves wep security settings from the 
-        * given credential parameters
-        * @param aCredentialAttribute credential parameters including wep
-        * security settings data
-        * @param aWlanServiceId Wlan service id
-        * @param aDb Database session needed for saving
-        * wep security settings
-        */
-        void SaveWepSecuritySettingsL(
-                       TWlanProtectedSetupCredentialAttribute
-                        aCredentialAttribute, 
-                       TUint32 aWlanServiceId,
-                       CommsDat::CMDBSession& aDb );
-
-        /**
-        * Handles the given error code by dispaying an error note
-        * @param aErrorCode error code to handle
-        */
-        TBool HandleErrorL( TInt aErrorCode );
-
-        /**
-        * Steps into the next state of Wi-Fi Protected Setup sequence
-        * called from RunL()
-        */
-        void HandleNoErrorL ();
-
-
-        /**
-        * From MActiveRunnerCallback
-        * called when CWifiProtEnterPinDlg is finished
-        * @param TInt aResponse can be KErrNone or KErrCancel
-        */
-        void PinQueryExitL( TInt aResponse );
-
-        /**
-        * Called by UsePinCodeLinkSelectedL when pin code mechanism
-        * is selected. Sets iUsePin flag and completes Active Runner
-        * (this) object
-        */
-        void DoUsePinCodeLinkSelectedL();
-
-        /**
-        * Starts wlan scan
-        */
-        void StartWlanScan();
-        
-        /**
-        * Compares the fresh wlan networks list with the
-        * items returned by WPS. Puts the available network indexes
-        * into iAvailableNetworks
-        */
-        void CheckNetworkAvailabilityL();
-
-        /*
-        * Displays the Select Connection Dialog
-        * When there are more connections available to use
-        * (used in Create Connection Mode)
-        */
-        void SelectConnectionL();
-        
-        /*
-        * Displays a note to show the user that 
-        * no wlan networks were found during wlan scan
-        */
-        void ShowNoWlanNetworksNoteL();
-
-        /*
-        * Calls cancel on the possibly currently ongoing request
-        */
-        void CancelOngoingRequest();
-        
-        /**
-        * Sets wep key
-        * @param aWepSecSettings Wep security settings object
-        * @param aWepKey Wep key to set
-        * @param aKeyNumber number of wep key to set
-        */
-        void SetWepKeyL( CWEPSecuritySettings& aWepSecSettings,
-                         TWlanWepKey& aWepKey, TInt aKeyNumber );    
-
-    public:
-        /**
-        * Callback to handle pin code pin code mechanism link selection
-        */    
-        static TInt UsePinCodeLinkSelectedL( TAny* aObject );
-        
-    private:
-        // reference to parent object
-        CWiFiProtDlgsPlugin* iParent;
-        // wait dialog
-        CAknWaitDialog* iWaitDlg;  ///Owned
-        // RCmManagerExt object for Cm Manager operations
-        RCmManagerExt* iCmManagerExt; //NOT OWNED!!!
-        // ETrue if connection is needed after the Wi-Fi Protected
-        // setup.
-        TBool iIsConnectionNeeded;
-        // Array to store returned uids of created iaps (connection methods)
-        RArray<TUint32>* iUids;//NOT OWNED!!!
-        // flag to indicate that wait dialog was cancelled
-        TBool iWaitDlgCancelled;
-        // ssid of the network to setup
-        TWlanSsid iSsid;
-        // iap id of the temporary iap
-        TUint32 iTempIapId ;
-        // service id of the temporary iap
-        TUint32 iTempServId ;
-        // PIN code (holds a value only if PIN method is used)
-        // for Wi-Fi Protected Setup authentication
-        TBuf<KMaxPINLength> iPIN;
-        // Wlan mgmt engine
-        CWlanMgmtClient* iWlanMgmtEngine;
-        // Next state, checked in RunL to control the setup process
-        TWiFiProtStates iNextWiFiProtState;
-        // return value
-        WiFiProt::TWiFiReturn iReturn;
-        // A flag to indicate that PIN method is used
-        TBool iUsePin;
-        // Holds the error code from wlan mgmt engine after 
-        // our wlan mgmt server request is complete
-        TInt iError;
-        // Active Scheduler wait object to hold the process until we are 
-        // complete
-        CActiveSchedulerWait iWait;
-        // Array to hold the connection methods which are created from 
-        // the data returned from wlan mgmt engine
-        RPointerArray<RCmConnectionMethodExt> iCmArray;//used to store cms
-                                                    // before submitting them
-        // The connection metod parameters returned from wlan mgmt engine
-        CArrayFixSeg<TWlanProtectedSetupCredentialAttribute>*
-                     iIapParametersArray; //parameters from wlan mgmt engine
-        // ETrue if Pin Query Dialog is active
-        TBool iPinQueryActive;
-        // ETrue if a wait note is needed to be shown
-        TBool iWaitNoteNeeded;
-        // initiate setup dialog is stored to handle link selection callback,
-        // not owned
-        CWiFiProtInitiateEasySetupDlg* iInitDialog;
-        // Wlan Scan Info
-        CWlanScanInfo* iScanInfo;
-        // List of available networks, contains indexes for iIapParametersArray
-        RArray<TInt> iAvailableNetworks;
-        // index of selected network in iAvailableNetworks
-        TInt iSelectedNetworkIndex;
-        // ongoing request to cancel if cancelled
-        TWiFiProtOutstandingRequest iORequest;
-        // Cancel called by user, cancel at next RunL cycle
-        TBool iUserCancelled;
-        // ETrue if the process is cancelled by the client.
-        TBool iClientCancelled;
-        // Flag to indicate that the 'use pin code' link was used
-        // and we have to destroy the dialog later, because avkon crashes if
-        // we do it in the callback (DoUsePinCodeLinkSelectedL)
-        TBool iDestroyInitDialogLater;
-        // not owned, just keeping pointer to handle cancel softkey removal
-        CWiFiProtEnterPinDlg* iPinDlg;
-        //pointer to network settings to be returned if WPS is used for 
-        // connection creation 
-        TWlanProtectedSetupCredentialAttribute* iNetworkSettings;
-        // ETrue if the WPS process is used in synchronous mode
-        TBool iSyncMode;
-        // ETrue if phone is in offline mode.
-        TBool iInOfflineMode;
-        // Stores data for offline note. Used
-        // only for writing result. Not read.
-        TPckgBuf<TBool> iOfflineReply;
-        // Interface to Notifier
-        RNotifier iNotifier;
-        // Pointer to the 1st confirmation dialog. Owned.
-        CWiFiProtConfirmationNoteDlg* iConfirmationDialog;
-        
-
-
-    };
-
-#endif //C_WIFIPROTACTIVERUNNER_H
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotactiverunnercallback.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Defines MActiveRunnerCallback interface
-*
-*/
-
-/*
-* %version: tr1cfwln#5 %
-*/
-
-#ifndef M_ACTIVERUNNERCALLBACK_H
-#define M_ACTIVERUNNERCALLBACK_H
-/**
- * MActiveRunnerCallback
- * callback interface to handle PIN query exit
- * @since S60 v3.2
-*/
-class MActiveRunnerCallback
-    {
-    public:
-        /**
-        * called when CWifiProtEnterPinDlg is finished
-        * @param TInt aResponse can be KErrNone or KErrCancel
-        */
-        virtual void PinQueryExitL( TInt aResponse ) = 0;
-    };
-#endif //M_ACTIVERUNNERCALLBACK_H
\ No newline at end of file
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotconfirmationnotedlg.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtConfirmationNoteDlg.
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#ifndef C_WIFIPROTCONFIRMATIONNOTEDLG_H__
-#define C_WIFIPROTCONFIRMATIONNOTEDLG_H__
-
-// INCLUDES
-#include <AknQueryDialog.h>
-
-// CLASS DECLARATIONS
-
-/**
- * Class implements a query dialog.
- */
-NONSHARABLE_CLASS( CWiFiProtConfirmationNoteDlg ) : public CAknQueryDialog
-    {
-public:
-    /**
-    * Constructor the CWiFiProtConfirmationNoteDlg class
-    * @param aStatus TRequestStatus of the client,
-    * gets completed when dialog finishes 
-    * @return -
-    */
-    CWiFiProtConfirmationNoteDlg( TRequestStatus& aStatus );
-   
-    /**
-    * Destructor
-    */
-    virtual ~CWiFiProtConfirmationNoteDlg();   
-    
-    /**
-    * From @c MEikCommandObserver. 
-    *
-    * Acts on the menu selection if menu is showing 
-    * @param aCommandId id of the command to process
-    *
-    * Responds to @c EAknSoftkeyOk and @c EAknSoftkeyYes and 
-    * @c EAknSoftkeyDone and @c EWiFiSoftkeyContinue commands. 
-    *
-    * @since S60 3.0 
-    */
-    void ProcessCommandL( TInt aCommandId );  
-
-private:
-
-    /**
-    * Exit function the CWiFiProtConfirmationNoteDlg
-    * @param aButtonId Button id which is checked before
-    * deciding to exit or not
-    * @return TBool exit or no
-    */
-    virtual TBool OkToExitL( TInt aButtonId );
-
-    /**
-    * PreLayoutDynInitL
-    */
-    virtual void PreLayoutDynInitL(); 
-       
-private:
-    // Client's request status, dialog completes it when it finished
-    TRequestStatus& iRequestStatus;
-    };
-
-
-#endif  // C_WIFIPROTCONFIRMATIONNOTEDLG_H__
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotdlgsplugin.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of CWiFiProtDlgsPlugin
-*
-*/
-
-/*
-* %version: tr1cfwln#11 %
-*/
-
-#ifndef C_WIFIPROTDLGSPLUGIN_H
-#define C_WIFIPROTDLGSPLUGIN_H
-
-
-// INCLUDES
-#include <cmmanagerext.h>
-#include <wlanmgmtcommon.h>
-#include <wifiprotreturn.h>
-#include <eiknotapi.h>
-
-using namespace WiFiProt;
-
-class TWiFiOutputParams;
-class CWiFiProtActiveRunner;
-
-
-
-
-
-/**
- * CWiFiProtDlgsPlugin class
- * Notifier Framework plugin for Wi-Fi Protected Setup
- */
-class CWiFiProtDlgsPlugin : public CBase, public MEikSrvNotifierBase2
-
-    {
-    
-public:
-    
-    /**
-    * NewL function
-    * @param  aResourceFileResponsible - ETrue if the plugin handles the
-    * resource file
-    * @param  aCmManagerExt - CmManager to use during Wi-Fi Protected Setup
-    * return CWiFiProtDlgsPlugin*
-    */
-    static CWiFiProtDlgsPlugin* NewL( const TBool aResourceFileResponsible,
-                                              RCmManagerExt* aCmManagerExt );
-
-    /**
-    * NewL function
-    * @param  aResourceFileResponsible - ETrue if the plugin handles the
-    * resource file
-    * return CWiFiProtDlgsPlugin*
-    */
-    static CWiFiProtDlgsPlugin* NewL( const TBool aResourceFileResponsible );
-
-
-    /**
-    * Destructor
-    */
-    ~CWiFiProtDlgsPlugin( );
-
-    // From MEikSrvNotifierBase
-
-    /**
-    * Get Notifier information
-    * return TNotifierInfo Notifier info
-    */
-    TNotifierInfo Info() const;
-
-    /**
-    * Start the Notifier
-    * @param  aBuffer   Not used
-    * return TPtrC8     Always NULL
-    */
-    TPtrC8 StartL( const TDesC8& aBuffer );
-
-    /**
-    * Cancel() the notifier
-    * @param  -
-    * return -
-    */
-    void Cancel();
-
-    /**
-    * Release the notifier
-    * @param  -
-    * return -
-    */
-    void Release();
-
-    /**
-    * Update Notifier
-    * @param  aBuffer   Not used
-    * return TPtrC8     Always NULL
-    */
-    TPtrC8 UpdateL( const TDesC8& aBuffer );
-
-    /**
-    * CompleteL the notifier is complete
-    * @param  aStatus status
-    * return  -
-    */
-    void CompleteL( TInt aStatus );
-
-    /**
-    * Sets iCancelled flag that indicates that the notifier was cancelled
-    * @param  aCancelled   Not used
-    */
-    void SetCancelledFlag( TBool aCancelled );
-    
-    /**
-    * RegisterL register the client notifier function
-    * return TNotifierInfo Contains uid, channel and priority of
-    * the registered notifier
-    */
-    TNotifierInfo RegisterL();
-
-    /**
-    * Start the Notifier
-    * @param  aBuffer    Buffer that stores parameters from client side
-    * @param  aReplySlot Identifies which message argument to use for the 
-    *                    reply. This message argument will refer to a 
-    *                    modifiable descriptor, a TDes8 type, into which data
-    *                    can be returned. 
-    * @param  aMessage   Message
-    */
-    void StartL( const TDesC8& aBuffer, TInt aReplySlot, 
-                 const RMessagePtr2& aMessage );
-
-    /**
-    * Asynchronous notifier dialog sequence is completed by calling this function.
-    * @param aReturnValue - possible return values are ok, cancel
-    * process and not use protected setup (No Automatic Setup).
-    */
-    void CompleteProcessL( WiFiProt::TWiFiReturn aReturnValue );
-    
-    /**
-    * Starts Wi-Fi Protected Setup
-    * Private interface to be used by applications with ui
-    * runs in the same process, so pointers can be passed
-    * @param aSSid contains SSid of the network we want to configure 
-    * @param aConnectionNeeded ETrue if we need a connection via the
-    * configured network 
-    * @param aUidsReturned uids of the configured connection methods
-    * @return aReturnValue - possible return values are ok, cancel
-    * process and not use protected setup (No Automatic Setup).
-    */  
-    
-    WiFiProt::TWiFiReturn StartFromUiL( const TWlanSsid& aSSid,
-                                        TBool aConnectionNeeded,
-                                        RArray<TUint32>& aUidsReturned);
-
-
-private:
-
-    /**
-    * Returns the correct RCmManagerExt instance's reference
-    * it can be an own instance, or a passed reference in case
-    * StartFromUiL was called (we are in the same process as the caller)
-    * This is necessary because we can't open two CmManagers the same time
-    * and the client is possibly using one already.
-    * @return a passed or an own RCmManagerExt& instance, based on the 
-    * method of calling CWiFiProtDlgsPlugin 
-    */
-    RCmManagerExt& CmManagerToUse();
-    
-private:    
-
-    /**
-    * Constructor
-    */
-    CWiFiProtDlgsPlugin( );
-    
-    /**
-    * CWiFiProtDlgsPlugin second level constructor
-    * @param  aResourceFileName Resource file to open
-    * @param  aResourceFileResponsible ETrue if this notifier is
-    * responsible for the resource file
-    * @param aCmManagerExt CmManager to use
-    * @see CWiFiProtDlgsPlugin::CmManagerToUse
-    */
-    void ConstructL( const TDesC& aResourceFileName,
-                     const TBool aResourceFileResponsible,
-                      RCmManagerExt* aCmManagerExt = NULL );
-
-
-                  
-private:
-
-    RCmManagerExt iCmManagerExt;        // own CmManager
-    RCmManagerExt* iPassedCmManagerExt; // passed CmManager, not owned
-    CWiFiProtActiveRunner* iRunner;     // Active Runner object
-    TWiFiReturn iReturn;                // return value towards the client 
-    RArray<TUint32> iUids;              // uids of created connection methods
-    TNotifierInfo iInfo;                // Notifier info
-    RMessagePtr2 iMessage;              // Message
-    TInt iReplySlot;                    // Reply slot
-    TBool iCancelled;                   // ETrue if WPS process is cancelled
-    TInt iResource;                     // Resource
-    TBool   iConnMode;                  // ETrue if creating a connection
-    // network settings to be returned if WPS is used for connection creation
-    TWlanProtectedSetupCredentialAttribute iNetworkSettings;
-    TBool iCancelledFromInside;               // ETrue if user or WLAN engine has cancelled
-    TBool iClientCancelled;		// ETrue if the notifier client has called Cancel()
-    };
-
-
-#endif // C_WIFIPROTDLGSPLUGIN_H
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotenterpindlg.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtEnterPinDlg.
-*
-*/
-
-/*
-* %version: tr1cfwln#9 %
-*/
-
-#ifndef C_WIFIPROTENTERPINDLG_H
-#define C_WIFIPROTENTERPINDLG_H
-
-// INCLUDES
-#include <AknQueryDialog.h>
-
-// FORWARD DECLARATIONS
-class MActiveRunnerCallback;
-
-// CLASS DECLARATIONS
-
-/**
- * Class implements a query dialog.
- */
-NONSHARABLE_CLASS( CWiFiProtEnterPinDlg ) : public CAknQueryDialog
-    {
-public:
-    /**
-    * Constructor of the CWiFiProtEnterPinDlg class
-    * @param MActiveRunnerCallback& aActiveRunnerCallback callback to
-    * notify the client of user response
-    * Active Runner gets completed when the dialog finishes 
-    */
-    CWiFiProtEnterPinDlg( MActiveRunnerCallback& aActiveRunnerCallback );
-
-   
-    /**
-    * Destructor
-    */
-    virtual ~CWiFiProtEnterPinDlg();   
-    
-    /**
-    * From @c MEikCommandObserver. 
-    *
-    * Acts on the menu selection if menu is showing 
-    * @param aCommandId id of the command to process
-    *
-    * Responds to @c EAknSoftkeyOk and @c EAknSoftkeyYes and 
-    * @c EAknSoftkeyDone and @c EWiFiSoftkeyContinue
-    * @c EAknSoftkeyEmpty commands. 
-    *
-    * @since S60 3.0 
-    */
-    void ProcessCommandL( TInt aCommandId );  
-    
-    /*
-    * Removes Cancel softkey
-    */
-    void RemoveCancel();    
-
-private:
-
-    /**
-    * Exit function the CWiFiProtConfirmationNoteDlg
-    * @param aButtonId 
-    * @return TBool exit or no
-    */
-    virtual TBool OkToExitL( TInt aButtonId );
-
-    /**
-    * PreLayoutDynInitL
-    * @param    -
-    */
-    virtual void PreLayoutDynInitL();    
-private:
-    // Client's request status, dialog completes it when it finished
-    MActiveRunnerCallback& iActiveRunnerCallback;
-    };
-
-
-#endif  // C_WIFIPROTENTERPINDLG_H
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotinitiateeasysetupdlg.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class CWiFiProtInitiateEasySetupDlg.
-*
-*/
-
-/*
-* %version: tr1cfwln#6 %
-*/
-
-#ifndef C_WIFIPROTINITIATEEASYSETUPDLG_H
-#define C_WIFIPROTINITIATEEASYSETUPDLG_H
-
-// INCLUDES
-#include <aknmessagequerydialog.h>
-
-// CLASS DECLARATIONS
-/**
- * Class implements a query dialog.
- */
-NONSHARABLE_CLASS( CWiFiProtInitiateEasySetupDlg ) :
-                                              public CAknMessageQueryDialog
-    {
-public:
-    /**
-    * Constructor the CWiFiProtInitiateEasySetupDlg class
-    * @param aStatus Request status of the Active Runner
-    */
-    CWiFiProtInitiateEasySetupDlg( TRequestStatus& aStatus );
-
-    /**
-    * Destructor
-    */
-    virtual ~CWiFiProtInitiateEasySetupDlg();     
-
-    /**
-    * From @c MEikCommandObserver. 
-    */
- 
-    /**
-    * Tries to exit the dialog when the specified button is pressed, if this 
-    * button should exit the dialog.
-    *
-    * See @c OkToExitL() to determine which buttons can exit the dialog.
-    * 
-    * This will fail if user exit is prevented by the 
-    * @c EEikDialogFlagNoUserExit flag. If the @c EEikDialogFlagNotifyEsc flag
-    * is not set and the dialog has been cancelled it immediately deletes 
-    * itself.
-    * 
-    * @param aButtonId The id of the pressed button.
-    */
-    void TryExitL( TInt aButtonId );
-        
-private:
-
-    /**
-    * Exit function of CWiFiProtInitiateEasySetupDlg
-    * @param aButtonId 
-    * @return TBool exit or no
-    */
-    virtual TBool OkToExitL( TInt aButtonId );
-
-    /**
-    * PreLayoutDynInitL
-    * @param    -
-    */
-    virtual void PreLayoutDynInitL();    
-    
-    /** 
-    * From @c CCoeControl.
-    *
-    * Handles key events.
-    * 
-    * If a control wishes to process key events, it should implement this
-    * function. The implementation must ensure that the function returns 
-    * @c EKeyWasNotConsumed if it does not do anything in response to a 
-    * key event, otherwise, other controls or dialogs may be prevented 
-    * from receiving the key event. If it is able to process the event it 
-    * should return @c EKeyWasConsumed.
-    * 
-    * @param aKeyEvent The key event.
-    * @return Indicates whether or not the key event was used
-    *         by this control. 
-    */
-    TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode );
-    
-private:
-    // flag to indicate that the button group was changed
-    // this is needed for changing softkey when selecting link
-    TBool iButtonGroupPreviouslyChanged;
-    // Client's request status, dialog completes it when it finished
-    TRequestStatus& iRequestStatus;
-    };
-
-#endif  // C_WIFIPROTINITIATEEASYSETUPDLG_H
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotplugin.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of Wi-Fi Protected Setup Notifier Array
-*
-*/
-
-/*
-* %version: tr1cfwln#6 %
-*/
-
-#ifndef WIFIPROTPLUGIN_H
-#define WIFIPROTPLUGIN_H
-
-
-// INCLUDES
-#if !defined(__EIKNOTAPI_H__)
-#include <eiknotapi.h>
-#endif
-
-// GLOBAL FUNCTIONS
-//
-/**
-* Array of connection dialog plugins.
-* @return A CArrayPtr of MEikSrvNotifierBase2 based classes.
-*/
-IMPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray();
-
-
-// RSC file name.
-_LIT( KResourceFileName, "WiFiProtPlugin.rsc" );
-
-    
-#endif //WIFIPROTPLUGIN_H
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotplugin.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file contains declarations for resources of Connection Ui Utilities Notifier. The file can be included in C++ or resource file. 
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef WIFIPROTPLUGIN_HRH
-#define WIFIPROTPLUGIN_HRH
-
-// IDs of controls
-
-    
-enum TWiFiProtPluginIds
-    {
-    WiFiProtPlugin = 0x222    //  is it correct?
-    };
-
-enum TWiFiProtCommandIds
-    {
-    EWiFiSoftkeyContinue = 1
-    };
-    
-#endif      //  WIFIPROTPLUGIN_HRH
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/plugininc/wifiprotselectnetworkdlg.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Definition of class CWiFiProtSelectNetworkDlg.
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-#ifndef C_WIFIPROTSELECTNETWORKDLG_H
-#define C_WIFIPROTSELECTNETWORKDLG_H
-
-// INCLUDES
-#include <aknlistquerydialog.h>
-
-// CLASS DECLARATIONS
-/**
- * Class implements a query dialog.
- */
-NONSHARABLE_CLASS( CWiFiProtSelectNetworkDlg ) : public CAknListQueryDialog
-    {
-public:
-    /**
-    * Constructor the CWiFiProtSelectNetworkDlg class
-    * @param aStatus TRequestStatus from activerunner
-    * @param aSelected returned selection index
-    * @param CDesCArrayFlat* aItems listbox items, ownership passed
-    * @param CArrayPtr<CGulIcon>* aIcons listbox icons, ownership passed    
-    * @return -
-    */
-    CWiFiProtSelectNetworkDlg( TRequestStatus& aStatus , TInt& aSelected ,
-                               CDesCArrayFlat* aItems,
-                               CArrayPtr<CGulIcon>* aIcons );
-
-    /**
-    * Destructor
-    */
-    virtual ~CWiFiProtSelectNetworkDlg();     
-
-    /**
-    * Calls PrepareLC and RunLD with the supplied parameters
-    */
-    void PrepareAndRunLD(  );
-
-
-private:
-
-    /**
-    * Exit function of CWiFiProtSelectNetworkDlg
-    * @param aButtonId 
-    * @return TBool exit or no
-    */
-    virtual TBool OkToExitL( TInt aButtonId );
-    
-    /**
-    * PreLayoutDynInitL
-    */
-    void PreLayoutDynInitL();
-    
-    /**
-    * Handles a change to the application's resources.
-    * @param aType Type of resource change
-    */
-    void HandleResourceChange( TInt aType );
- 
-private:
-    // Client's request status, dialog completes it when it finished
-    TRequestStatus& iRequestStatus;
-    // Selected item's index
-    TInt& iSelected;
-    // Icons array
-    CArrayPtr<CGulIcon>* iIcons;
-    // Items array
-    CDesCArrayFlat* iItems;
-    };
-
-#endif  // C_WIFIPROTSELECTNETWORKDLG_H
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotactiverunner.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2055 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implements a state - machine like active object that controls Wi-Fi Protected Setup Process. 
-*
-*/
-
-/*
-* %version: tr1cfwln#30 %
-*/
-
-//SYSTEM INCLUDES
-#include <wlanmgmtclient.h>
-#include <wifiprotplugin.rsg>
-#include <StringLoader.h>
-#include <AknWaitDialog.h>
-#include <cmpluginwlandef.h>
-#include <commdb.h>
-#include <WPASecuritySettingsUI.h>
-#include <WEPSecuritySettingsUI.h>
-#include <e32math.h>
-#include <cmconnectionmethoddef.h>
-#include <wlanerrorcodes.h>
-#include <utf.h>
-#include <AknIconArray.h>
-#include <AknGlobalNote.h>
-#include <AknSgcc.h>
-#include <uikon/eiksrvui.h>
-#include <AknsUtils.h>
-#include <data_caging_path_literals.hrh>
-#include <wifiprot.mbg>
-
-#include <CoreApplicationUIsSDKCRKeys.h>
-#include <e32std.h>
-
-//USER INCLUDES
-#include "wifiprotlogger.h"
-#include "wifiprotactiverunner.h"
-#include "wifiprotconfirmationnotedlg.h"
-#include "wifiprotselectnetworkdlg.h"
-#include "wifiprotenterpindlg.h"
-#include "wifiprotinitiateeasysetupdlg.h"
-
-#include "featmgr.h"
-
-// valid Wep key lengths, to check wep key format
-// (wep key format depends on key length)
-const TInt KConnUiUtilsWepLengthASCII5 = 5;
-const TInt KConnUiUtilsWepLengthASCII13 = 13;
-const TInt KConnUiUtilsWepLengthASCII29 = 29;
-const TInt KConnUiUtilsWepLengthHEX10 = 10;
-const TInt KConnUiUtilsWepLengthHEX26 = 26;
-const TInt KConnUiUtilsWepLengthHEX58 = 58; 
-#ifdef __WINS__
-const TInt KNumberOfEmulatedAvailableNetworks = 2; 
-const TInt KIndexOfFirstEmulatedAvailableNetwork = 0;
-const TInt KIndexOfSecondEmulatedAvailableNetwork = 1;
-#endif
-
-/**
-* Management frame information element IDs.
-* needed to determine coverage
-*/
-enum T802Dot11InformationElementID
-    {
-    E802Dot11SsidIE                 = 0,
-    E802Dot11SupportedRatesIE       = 1,
-    E802Doi11FhParameterSetIE       = 2,
-    E802Dot11DsParameterSetIE       = 3,
-    E802Dot11CfParameterSetIE       = 4,
-    E802Dot11TimIE                  = 5,
-    E802Dot11IbssParameterSetIE     = 6,
-    E802Dot11CountryIE              = 7,
-    E802Dot11HoppingPatternParamIE  = 8,
-    E802Dot11HoppingPatternTableIE  = 9,
-    E802Dot11RequestIE              = 10,
-
-    E802Dot11ChallengeTextIE        = 16,
-    // Reserved for challenge text extension 17 - 31
-    E802Dot11ErpInformationIE       = 42,
-    E802Dot11ExtendedRatesIE        = 50,
-    E802Dot11AironetIE              = 133,
-    E802Dot11ApIpAddressIE          = 149,
-    E802Dot11RsnIE                  = 221
-    };
-
-const TInt KArrayGranularity = 10; 
-const TInt KIconsGranularity = 4;
-
-_LIT( KWiFiFileIcons, "z:wifiprot.mbm" );
-
-_LIT8( KEapWsc, "\xFE\x00\x37\x2A\x00\x00\x00\x01");
-
-_LIT( KWiFiPanic, "Wi-Fi Protected Setup");
-
-using namespace CMManager;
-
-// ================= MEMBER FUNCTIONS =======================
-//
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::NewL
-// --------------------------------------------------------------------------
-//
-CWiFiProtActiveRunner* CWiFiProtActiveRunner::NewL(
-        CWiFiProtDlgsPlugin* aParent, TInt aPriority )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::NewL" );
-    
-    CWiFiProtActiveRunner* self =
-         new(ELeave) CWiFiProtActiveRunner( aParent, aPriority );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); // self
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::NewL" );
-    
-    return self;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::~CWiFiProtActiveRunner
-// --------------------------------------------------------------------------
-//
-CWiFiProtActiveRunner::~CWiFiProtActiveRunner()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::~CWiFiProtActiveRunner" );
-
-    // Close notifier
-    iNotifier.Close();
-
-    Cancel();
-    
-    // If the cancel has been initiated by the client, temp IAP cannot be deleted until
-    // after the RNotifier Cancel() call has returned (deadlock between MPM and CMM).
-    // Therefore, temp IAP cleanup must be done later.
-    if ( !iClientCancelled )
-        {
-        TRAP_IGNORE( DeleteTempIapL() ); //we can't do much if delete fails
-        }
-    
-    delete iWlanMgmtEngine;
-    
-    // if cancelled from client, wait note may still be visible
-    if ( iWaitDlg )
-        {
-        CLOG_WRITE( "iWaitDlg->SetCallback( NULL );" );
-        iWaitDlg->SetCallback( NULL );
-        CLOG_WRITE( "iWaitDlg->ProcessFinishedL( );" );
-        TRAP_IGNORE( iWaitDlg->ProcessFinishedL() );
-        delete iWaitDlg;
-        }
-    
-    if ( iPinDlg )
-        {
-        delete iPinDlg;
-        }
-    
-    TBool cleanupCms = EFalse;
-    if ( iReturn == EWiFiCancel )
-        {
-        cleanupCms = ETrue;
-        }
-        
-    for ( TInt i = 0; i < iCmArray.Count();i++ )
-        {
-        // if we are setting up a connection, we save the settings into
-        // easy wlan iap (connection method), which we shouldn't ever delete!
-        if ( ( !iIsConnectionNeeded ) && cleanupCms )
-            {
-            //we can't do much if delete fails
-            TRAP_IGNORE( iCmArray[i]->DeleteL() );
-            }
-        iCmArray[i]->Close();
-        delete iCmArray[i];
-        iCmArray[i] = NULL;
-        }
-        
-    iCmArray.ResetAndDestroy();
-    iAvailableNetworks.Close();
-    delete iIapParametersArray;
-    delete iScanInfo;
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::~CWiFiProtActiveRunner" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::StartProtectedSetupL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::StartProtectedSetupAsyncL (
-                                            const TWlanSsid& aSSid,
-                                            RArray<TUint32>& aUids,
-                                            RCmManagerExt& aCmManagerToUse )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::StartProtectedSetupAsyncL" );
-    
-    iIsConnectionNeeded = EFalse;
-    iUids = &aUids;
-    iCmManagerExt = &aCmManagerToUse;    
-    iSsid.Copy( aSSid );
-    ShowInitialDialogL();
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::StartProtectedSetupAsyncL" );
-    
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::StartProtectedSetupConnL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::StartProtectedSetupConnL (
-                                     const TWlanSsid& aSSid,
-                                     TWlanProtectedSetupCredentialAttribute&
-                                          aNetworkSettings,
-                                     RCmManagerExt& aCmManagerToUse )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::StartProtectedSetupConnL" );
-    
-    iIsConnectionNeeded = ETrue;
-    iNetworkSettings = &aNetworkSettings;
-    iCmManagerExt = &aCmManagerToUse;    
-    iSsid.Copy( aSSid );
-    ShowInitialDialogL();
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::StartProtectedSetupConnL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::StartProtectedSetupL
-// --------------------------------------------------------------------------
-//
-WiFiProt::TWiFiReturn CWiFiProtActiveRunner::StartProtectedSetupL (
-                                            const TWlanSsid& aSSid,
-                                            RArray<TUint32>& aUids,
-                                            RCmManagerExt& aCmManagerToUse )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::StartProtectedSetupL" );
-    
-    iSyncMode = ETrue;
-    iIsConnectionNeeded = EFalse;
-    iUids = &aUids;
-    iCmManagerExt = &aCmManagerToUse;    
-    iSsid.Copy( aSSid );
-    ShowInitialDialogL();
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::StartProtectedSetupL" );
-    
-    return iReturn;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::CancelByClient()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::CancelByClient()
-    {
-    iClientCancelled = ETrue;
-    Cancel();
-    if ( iWaitDlg )
-        {
-        CLOG_WRITE( "Removing wait note( );" );
-        iWaitDlg->SetCallback( NULL );
-        
-        TRAPD(err, iWaitDlg->ProcessFinishedL());
-        if (err)
-            {
-            CLOG_WRITE( "LEAVE: iWaitDlg->ProcessFinishedL" );
-            
-            }
-        delete iWaitDlg;
-        iWaitDlg = NULL;
-        }
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ShowInitialDialogL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ShowInitialDialogL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ShowInitialDialogL" );
-    
-    if ( IsActive() == EFalse ) 
-        {
-        
-        // Check if offline mode is on:
-        iInOfflineMode = EFalse;
-        if ( FeatureManager::FeatureSupported( KFeatureIdOfflineMode ) )
-               {
-               TInt connAllowed;
-               CRepository* repository = CRepository::NewLC( 
-                                                           KCRUidCoreApplicationUIs );
-               repository->Get( KCoreAppUIsNetworkConnectionAllowed, connAllowed );
-               CleanupStack::PopAndDestroy(repository);  // repository
-               if ( connAllowed == 0 )
-                   {
-                   iInOfflineMode = ETrue;
-                   }
-               }
-
-        if ( iInOfflineMode && iSyncMode )
-            {
-            // If in offline mode, query about offline mode first.
-            iNextWiFiProtState = EWifiProtOfflineQuery;
-            }
-        else
-            {
-            // Else initiate easy setup.
-            iNextWiFiProtState = EWiFiProtInitiateEasySetup;
-            }
-        
-        iConfirmationDialog =
-                     new ( ELeave ) CWiFiProtConfirmationNoteDlg( iStatus );
-        iConfirmationDialog->ExecuteLD( R_WIFIPROT_CONFIGURE_AUTO_DIALOG );
-        iORequest = EWiFiProtReqConfirmDialog;
-        SetActive( );
-        if ( iSyncMode )
-            {
-            CLOG_WRITE(  "CActiveSchedulerWait Started" );
-            iWait.Start();
-            CLOG_WRITE(  "CActiveSchedulerWait Returned" );
-            }
-                        
-        }// do nothing if already active
-        
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ShowInitialDialogL" );
-    
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ShowInitiateEasySetupDialogL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ShowInitiateEasySetupDialogL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ShowInitiateEasySetupDialogL" );
-    
-    iDestroyInitDialogLater = EFalse;
-    iNextWiFiProtState = EWiFiProtUsePinCode;
-    //store it, but not own it
-    iInitDialog = new ( ELeave ) CWiFiProtInitiateEasySetupDlg( iStatus ); 
-    iInitDialog->PrepareLC( R_WIFIPROT_INITIATE_EASY_SETUP_DIALOG );
-    _LIT( KLinkStartTag, "\n<AknMessageQuery Link>" );
-    _LIT( KLinkEndTag, "</AknMessageQuery Link>" );
-
-    HBufC *messageBase =
-             StringLoader::LoadLC( R_QTN_NETW_CONSET_WPS_MSG_PBC );
-    HBufC* linkString1 = StringLoader::LoadLC( 
-                            R_QTN_NETW_CONSET_WPS_MSG_LINK_USE_PIN );
-
-    TInt lenMsg = messageBase->Des().Length()+
-                  linkString1->Des().Length()+
-                  KLinkStartTag().Length()+
-                  KLinkEndTag().Length();    
-    
-    HBufC* message = HBufC::NewLC( lenMsg );
-    TPtr messagePtr = message->Des();
-
-    messagePtr.Append( messageBase->Des() ); 
-
-    messagePtr.Append( KLinkStartTag ); 
-    messagePtr.Append( linkString1->Des() );
-    messagePtr.Append( KLinkEndTag );    
-    
-    iInitDialog->SetMessageTextL( messagePtr );
-    CleanupStack::PopAndDestroy( message );
-    
-    CleanupStack::PopAndDestroy( linkString1 );
-    CleanupStack::PopAndDestroy( messageBase );    
-    TCallBack callBackLink( CWiFiProtActiveRunner::UsePinCodeLinkSelectedL,
-                                                                     this );
-
-    iInitDialog->SetLink( callBackLink  );    
-    iInitDialog->RunLD();
-    iORequest = EWiFiProtReqInitDialog;
-    SetActive( );
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ShowInitiateEasySetupDialogL" );
-    
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ShowEnterPinOnStationDialogL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ShowEnterPinOnStationDialogL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ShowEnterPinOnStationDialogL" );
-    
-    iNextWiFiProtState = EWiFiProtStartingWaitDlg;
-    TInt pin = 0;
-    TTime t;
-    t.HomeTime();
-    TInt64 seed = t.Int64();
-    do  {
-         pin = Math::Rand( seed );
-        }
-        while ( pin <(10^(KMaxPINLength-2))
-             || ( ((pin / 1000000) % 10) ) == 0 );
-    //last digit is checksum, so we need 7 digits
-    //and the first shouldn't be 0
-    pin = pin % 10000000; 
-    TInt checkSum = ComputeChecksum(pin);
-    pin *= 10;
-    pin += checkSum;
-    _LIT(KPinFormat,"%d");
-    iPIN.Format(KPinFormat, pin);
-    
-    CLOG_WRITE( "Enter pin code note" );
-    
-    HBufC* prompt =
-     StringLoader::LoadLC( R_QTN_NETW_CONSET_WPS_INFO_ENTER_PIN_CODE, pin );
-    CWiFiProtEnterPinDlg* pinDlg = new ( ELeave ) CWiFiProtEnterPinDlg( *this );
-    
-    CleanupStack::PushL(pinDlg);
-    pinDlg->SetPromptL( *prompt );
-    CleanupStack::Pop(pinDlg);
-
-    CleanupStack::PopAndDestroy( prompt );
-    iPinDlg = pinDlg;
-    iPinDlg->ExecuteLD( R_WIFIPROT_ENTER_PIN_CODE_DIALOG );
-    iPinQueryActive = ETrue;
-    SetActive( );
-    SetNextStateAndComplete( EWiFiProtConfiguring );
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ShowEnterPinOnStationDialogL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ShowWaitingDialogL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ShowWaitingDialogL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ShowWaitingDialogL" );
-    HBufC* text = StringLoader::LoadLC(
-            R_QTN_NETW_CONSET_WAIT_WPS_CONFIGURING );
-    iWaitDlg = new ( ELeave ) CAknWaitDialog(
-                          ( REINTERPRET_CAST( CEikDialog**, &iWaitDlg )),
-                            ETrue );
-    iWaitDlg->SetTextL( *text );
-    CleanupStack::PopAndDestroy( text );
-    iWaitDlg->SetCallback( this );
-    iWaitDlg->SetTone( CAknNoteDialog::EConfirmationTone );
-    iWaitDlg->ExecuteLD( R_WIFIPROT_WAIT_NOTE  );
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ShowWaitingDialogL" );
-    }
-
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ShowWaitingDialogAndProceedL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ShowWaitingDialogAndProceedL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ShowWaitingDialogAndProceedL" );
-    
-    iStatus = KRequestPending; //should be set by service provider
-    ShowWaitingDialogL();
-    SetActive( );
-    SetNextStateAndComplete( EWiFiProtConfiguring );
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ShowWaitingDialogAndProceedL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ShowFinalNoteL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ShowFinalNoteL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ShowFinalNoteL" );
-    
-    const TInt KSettingsConfNone = 0;
-    const TInt KSettingsConfOne = 1;
-    const TInt KSettingsConfMulti = 2;
-    const TInt KResourceIdInvalid = 0;
-    
-    HBufC* text = NULL;
-    TInt resId = KResourceIdInvalid;
-    CAknNoteDialog::TTone tone = CAknNoteDialog::ENoTone;
-    TInt numberOfNetworksConfigured = 0;
-    if ( iIsConnectionNeeded )
-        {
-        // we have one network configured if we are here
-        numberOfNetworksConfigured = 1;
-        }
-    else
-        {
-        numberOfNetworksConfigured = iCmArray.Count();
-        }
-        
-    
-    //more than one = multiple
-    if ( numberOfNetworksConfigured > KSettingsConfOne) 
-        {
-        numberOfNetworksConfigured = KSettingsConfMulti;
-        }
-    switch ( numberOfNetworksConfigured )
-        {
-        case KSettingsConfOne :
-            {
-            CLOG_WRITE( "Show one network configured note " );
-            HBufC* name;
-            if ( iIsConnectionNeeded )
-                {
-                // We have to convert the 8-bit SSID to 16-bit 
-                HBufC* ssid16 = HBufC::NewLC( (*iIapParametersArray)
-                    [iAvailableNetworks[
-                            iSelectedNetworkIndex]].iSsid.Length()+1 );
-                TPtr ssid16Ptr( ssid16->Des() );
-                CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16Ptr,
-                    (*iIapParametersArray)[iAvailableNetworks[
-                                        iSelectedNetworkIndex]].iSsid );
-                ssid16Ptr.ZeroTerminate();
-                name = ssid16Ptr.AllocL();
-                CleanupStack::PopAndDestroy( ssid16 );             
-                }
-            else
-                {
-                RCmConnectionMethodExt cm =
-                     iCmManagerExt->ConnectionMethodL(
-                                    iCmArray[0]->GetIntAttributeL( ECmId ) );
-                CleanupClosePushL( cm );
-                name =  cm.GetStringAttributeL( EWlanSSID );
-                CleanupStack::PopAndDestroy( &cm );
-                }
-            CleanupStack::PushL( name );
-            text = StringLoader::LoadL(
-                 R_QTN_NETW_CONSET_CONF_WPS_ONE_NETWORK_CONFIGURED , *name);
-            CleanupStack::PopAndDestroy( name );
-            CleanupStack::PushL( text );
-            resId = R_WIFIPROT_OK_NOTE;
-            tone = CAknNoteDialog::EConfirmationTone;
-            break;
-            }
-        case KSettingsConfMulti:
-            {
-            CLOG_WRITE( "Show multiple networks configured note " );
-            text = StringLoader::LoadLC(
-                 R_QTN_NETW_CONSET_CONF_WPS_MULTIPLE_NETWORKS_CONFIG );
-            resId = R_WIFIPROT_OK_NOTE;
-            tone = CAknNoteDialog::EConfirmationTone;
-            break;
-            }
-        case KSettingsConfNone :
-            {
-            CLOG_WRITE( "Show no networks configured note " );
-            text = StringLoader::LoadLC(
-                 R_QTN_NETW_CONSET_CONF_WPS_NO_NETWORKS_CONFIGURED );
-            resId = R_WIFIPROT_INFO_NOTE;
-            break;
-            }
-        default:
-            {
-            //should not ever get here
-            CLOG_WRITE( "Unhandled Final Note!!!" );
-            User::Leave( KErrGeneral );
-            break;            
-            }
-        }
-
-    CAknNoteDialog* dlg = new (ELeave) CAknNoteDialog(
-                             tone,
-                             CAknNoteDialog::ELongTimeout );
-    dlg->SetTextL( *text );
-    CleanupStack::PopAndDestroy( text );   
-    iStatus = KRequestPending; //should be set by service provider
-    SetActive( );
-    dlg->ExecuteLD( resId  ); 
-    SetNextStateAndComplete( EWiFiProtFinished );
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ShowFinalNoteL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::DialogDismissedL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::DialogDismissedL( TInt aButtonId )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::DialogDismissedL" );
-    
-    //wait dialog cancelled
-    if ( aButtonId == EAknSoftkeyCancel )
-        {    
-        CLOG_WRITE( "Cancel pressed!" );
-        if (iWaitDlg)
-            {
-            iWaitDlgCancelled = ETrue;
-            }
-        iUserCancelled = ETrue;   
-        CancelOngoingRequest();        
-        }
-    // iWaitDlg is destroyed, so we can null it
-    iWaitDlg = NULL; 
- 
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::DialogDismissedL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::CreateTempIapL
-// --------------------------------------------------------------------------
-//
-TUint32 CWiFiProtActiveRunner::CreateTempIapL( TUint32& aTempServId )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::CreateTempIapL" );
-    
-    RCmConnectionMethodExt cm;
-    cm = iCmManagerExt->CreateConnectionMethodL( KUidWlanBearerType );
-    CleanupClosePushL(cm);
-
-    // We have to convert the 8-bit SSID to 16-bit for CommsDat.
-    HBufC* ssid16 = HBufC::NewLC( iSsid.Length() );
-    TPtr ssid16Ptr( ssid16->Des() );
-    CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16Ptr , iSsid ); 
-    cm.SetStringAttributeL( EWlanSSID, *ssid16 ); 
-    cm.SetStringAttributeL( ECmName, *ssid16 ); 
-    CLOG_WRITEF( _L("SSid: ") );
-    CLOG_WRITEF( *ssid16 );
-    CleanupStack::PopAndDestroy( ssid16 ); 
-    
-    
-    cm.SetIntAttributeL( EWlanSecurityMode, EWlanSecModeWpa2 );
-    cm.UpdateL();
-    
-    aTempServId = cm.GetIntAttributeL( ECmIapServiceId );
-    TInt32 iapID = cm.GetIntAttributeL( ECmId );
-    
-    CommsDat::CMDBSession* db =
-       CommsDat::CMDBSession::NewL( CommsDat::CMDBSession::LatestVersion() );
-    CleanupStack::PushL( db );
-    CWPASecuritySettings* wpaSecSettings =
-         CWPASecuritySettings::NewL( ESecurityModeWpa );
-    CleanupStack::PushL( wpaSecSettings );      
-    User::LeaveIfError( wpaSecSettings->SetWPAEnabledEAPPlugin( KEapWsc ) );
-    CLOG_WRITEF( _L("Enabled EAP plugin set: EAP WSC"));
-    if (iPIN != KNullDesC)
-        { 
-        User::LeaveIfError( wpaSecSettings->SetWPAPreSharedKey( iPIN ) );
-        CLOG_WRITEF( _L("Pin set as WPA key: "));
-        CLOG_WRITEF( iPIN );
-        }    
-
-    CLOG_WRITEF( _L("WPA settings save - ECmIapServiceId in aTempServId %d"), aTempServId );
-    wpaSecSettings->SaveL( aTempServId , *db, ESavingBrandNewAP, 0 );
-    CLOG_WRITEF( _L("WPA settings saved!"));
-    CleanupStack::PopAndDestroy( wpaSecSettings );         
-    db->Close();
-    CleanupStack::PopAndDestroy( db ); 
-    CleanupStack::PopAndDestroy( &cm ); 
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::CreateTempIapL" );
-    
-    return iapID;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::RunProtectedSetup
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::RunProtectedSetup ( const TInt32 aIapId )
-    {
-    
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::RunProtectedSetup" );
-    
-    iNextWiFiProtState = EWiFiProtWlanMgmtEngineReturned;
-    if ( iWlanMgmtEngine ) 
-        {
-        CLOG_WRITEF(_L(
-         "We have a wlanmgmt engine, calling RunProtectedSetup with uid %d")
-         , aIapId );
-        iWlanMgmtEngine->RunProtectedSetup( iStatus, aIapId,
-                                            *iIapParametersArray );
-        iORequest = EWiFiProtReqWPS;
-        SetActive( );
-        }
-    else
-        {
-        // we complete ourselves after creating these cms synchronously
-        //just for wins testing
-        //add 1 conneciton method;
-#ifdef __WINS__
-        CLOG_WRITE( "No wlanmgmt engine, simulating... " );
-        TWlanProtectedSetupCredentialAttribute tmpCred;
-        tmpCred.iOperatingMode = EWlanOperatingModeInfrastructure;
-        tmpCred.iAuthenticationMode = EWlanAuthenticationModeOpen;
-        tmpCred.iSecurityMode = EWlanIapSecurityModeAllowUnsecure;
-        tmpCred.iSsid = _L8("Available Network");
-       
-        TRAP_IGNORE( iIapParametersArray->AppendL(tmpCred) );
-
-        tmpCred.iOperatingMode = EWlanOperatingModeInfrastructure;
-        tmpCred.iAuthenticationMode = EWlanAuthenticationModeOpen;
-        tmpCred.iSecurityMode = EWlanIapSecurityModeAllowUnsecure;
-        tmpCred.iSsid = _L8("Available Network 2");
-        
-        TRAP_IGNORE( iIapParametersArray->AppendL(tmpCred) );
-        
-        tmpCred.iOperatingMode = EWlanOperatingModeInfrastructure;
-        tmpCred.iAuthenticationMode = EWlanAuthenticationModeOpen;
-        tmpCred.iSecurityMode = EWlanIapSecurityModeAllowUnsecure;
-        tmpCred.iSsid = _L8("Unavailable Network");
-        
-        TRAP_IGNORE( iIapParametersArray->AppendL(tmpCred) );
-        
-        iStatus = KRequestPending;
-        SetActive( );
-        SetNextStateAndComplete(EWiFiProtWlanMgmtEngineReturned );
-#else
-        //no engine in hardware, should not ever get here!
-        User::Panic( KWiFiPanic , KErrNotFound );
-#endif
-        }
-        
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::RunProtectedSetup" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::CWiFiProtActiveRunner
-// --------------------------------------------------------------------------
-//
-CWiFiProtActiveRunner::CWiFiProtActiveRunner( 
-                    CWiFiProtDlgsPlugin* aParent,  TInt aPriority ) 
-                    : CActive( aPriority ),
-                    iParent( aParent ),
-                    iIsConnectionNeeded( EFalse ),
-                    iWaitDlgCancelled( EFalse ),
-                    iSsid( KNullDesC8 ),
-                    iPIN( KNullDesC ),
-                    iNextWiFiProtState( EWiFiProtAskConfigureAutomatically ),
-                    iReturn( EWiFiCancel ),
-                    iUsePin( EFalse ),
-                    iError( KErrNone ),
-                    iPinQueryActive( EFalse ),
-                    iWaitNoteNeeded( EFalse ),
-                    iInitDialog( NULL ),
-                    iClientCancelled( EFalse )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::CWiFiProtActiveRunner" );
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::CWiFiProtActiveRunner" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ConstructL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ConstructL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ConstructL" );   
-    
-    CActiveScheduler::Add( this );
-#ifndef __WINS__
-    iWlanMgmtEngine = CWlanMgmtClient::NewL();
-    iScanInfo = CWlanScanInfo::NewL();
-#endif // !__WINS__    
-    iIapParametersArray = new (ELeave)
-     CArrayFixSeg<TWlanProtectedSetupCredentialAttribute>
-                                    ( KArrayGranularity );
-
-    User::LeaveIfError(iNotifier.Connect()); // Connects to the extended notifier server
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ConstructL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::DoCancel
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::DoCancel()
-    { 
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::DoCancel" );
-    
-    CancelOngoingRequest();
-               
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::DoCancel" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::RunL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::RunL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::RunL" );
-    
-    // reset the async request id
-    iORequest = EWiFiProtReqNone;
-    
-    if ( iClientCancelled )
-        {
-        // no further actions needed here, message completion taken care of
-        // in the notifier
-        return;
-        }
-    
-    CLOG_WRITEF(  _L(" iNextWiFiProtState: %d"), iNextWiFiProtState );
-    if ( iNextWiFiProtState == EWiFiProtWlanMgmtEngineReturned ) 
-        {
-        iORequest = EWiFiProtReqNone;
-        //if we have a dialog and configuration is finished,
-        // store error code for destroying dialog         
-        iError = iStatus.Int();
-        CleanupTempIapL();
-        }
-    else if ( iNextWiFiProtState == EWiFiProtDestroyWaitNote )         
-        {
-        DestroyWaitDialog();
-        }
-    else
-        {
-        if ( iUserCancelled )        
-            {
-            iStatus = KErrCancel;
-            }
-            
-        if ( iStatus.Int() == KErrNone ) //no error
-            {
-            HandleNoErrorL();
-            } 
-         // error or cancel           
-         // try to handle error, if can't, just cancel 
-         else if ( !HandleErrorL( iStatus.Int() ) )  
-                {
-                if ( (iStatus.Int() != KErrAbort) && 
-                     (iNextWiFiProtState == EWifiProtOfflineQuery || iNextWiFiProtState == EWiFiProtInitiateEasySetup) )
-                    {
-                    // Use WPS to configure or connect in offline mode? -> No -> Continue the traditional way without WPS
-                    iReturn = EWifiNoAuto;
-                    }
-                 else
-                    {
-                    iReturn = EWiFiCancel;
-                    }
-                
-                if ( iSyncMode )
-                    {
-                    if ( iWait.IsStarted() )
-                        {
-                        iWait.AsyncStop();
-                        }
-                    }
-                else
-                    {
-                    iParent->CompleteProcessL( iReturn );
-                    }
-                }
-        }
-        
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::RunL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::SetNextStateAndComplete
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::SetNextStateAndComplete(
-                                                 TWiFiProtStates aNextState,
-                                                            TInt aError )
-    { 
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::SetNextStateAndComplete" );
-    
-    iNextWiFiProtState = aNextState;
-    CLOG_WRITEF(  _L(" aNextState: %d"), aNextState );
-    TRequestStatus* pS = &iStatus;                
-    User::RequestComplete( pS, aError ); 
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::SetNextStateAndComplete" );
-
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ConfigureL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ConfigureL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ConfigureL" );
-    iWaitNoteNeeded = ETrue;
-    iTempIapId = CreateTempIapL( iTempServId );
-    CLOG_WRITEF( _L("Temp Iap created! Id: %d"), iTempIapId );
-    RunProtectedSetup( iTempServId );
-    // do not complete self, waiting for engine or user cancel to complete us 
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ConfigureL" );
-    
-    }        
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::EvaluateResult
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::EvaluateResult()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::EvaluateResult" );
-    if (iError == KErrNone)
-        {
-        if ( iIsConnectionNeeded )
-            {
-            TRAPD(err, CheckNetworkAvailabilityL());
-            if (err)
-                {
-                CLOG_WRITE(
-                     "LEAVE: CheckNetworkAvailabilityL" );
-                }
-            }
-        else
-            {
-            CLOG_WRITE(
-                 "SetNextStateAndComplete( EWiFiProtSettingsConfNote );" );
-            SetNextStateAndComplete( EWiFiProtSettingsConfNote );
-            }
-        }
-    else
-        { //now we complete with the error code as dialog is finished
-        CLOG_WRITE( "SetNextStateAndComplete( EWiFiProtFinished, iError );" );
-        SetNextStateAndComplete( EWiFiProtFinished , iError );
-        }
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::EvaluateResult" );
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::DestroyWaitDialog
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::DestroyWaitDialog()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::DestroyWaitDialog" );
-    
-    CLOG_WRITE( "SetActive();" );
-    SetActive();    
-    iStatus = KRequestPending; //should be set by service provider
-    iWaitNoteNeeded = EFalse;
-    if( !iWaitDlgCancelled )
-        {
-        // iWaitDlg possibly wasn't even shown...
-        if ( iWaitDlg )
-            {
-            CLOG_WRITE( "iWaitDlg->SetCallback( NULL );" );
-            iWaitDlg->SetCallback( NULL );
-            CLOG_WRITE( "iWaitDlg->ProcessFinishedL( );" );
-            
-            TRAPD(err, iWaitDlg->ProcessFinishedL());
-            if (err)
-                {
-                CLOG_WRITE( "LEAVE: iWaitDlg->ProcessFinishedL( );" );
-                }
-            
-            CLOG_WRITE( "delete iWaitDlg;" );
-            delete iWaitDlg;
-            iWaitDlg = NULL;
-            }
-        if ( iPinQueryActive )   //waiting for PIN Query
-            {
-            CLOG_WRITE(
-             "SetNextStateAndComplete( EWiFiProtWaitForPINQuery );" );
-            // if pin query is still active, remove the cancel...
-            if ( iPinQueryActive && iPinDlg)
-                {
-                iPinDlg->RemoveCancel();
-                }            
-            iNextWiFiProtState = EWiFiProtWaitForPINQuery;
-            }
-        else
-            {
-            EvaluateResult();
-            }
-        }
-    else
-        {
-        CLOG_WRITE(
-         "SetNextStateAndComplete( EWiFiProtFinished, KErrCancel );" );
-        SetNextStateAndComplete( EWiFiProtFinished , KErrCancel );
-        }
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::DestroyWaitDialog" );
-    
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ComputeChecksum
-// --------------------------------------------------------------------------
-//
-TInt CWiFiProtActiveRunner::ComputeChecksum(TInt aPin)
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ComputeChecksum" );
-    
-    TInt accum = 0;
-    aPin *= 10;
-    accum += 3 * ((aPin / 10000000) % 10);
-    accum += 1 * ((aPin / 1000000) % 10);
-    accum += 3 * ((aPin / 100000) % 10);
-    accum += 1 * ((aPin / 10000) % 10);
-    accum += 3 * ((aPin / 1000) % 10);
-    accum += 1 * ((aPin / 100) % 10);
-    accum += 3 * ((aPin / 10) % 10);
-    TInt digit = (accum % 10);
-        
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ComputeChecksum" );
-    
-    return (10 - digit) % 10;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::CreateAllIapsL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::CreateAllIapsL()
-    {
-    CreateIapL(0);
-    iStatus = KRequestPending; //should be set by service provider
-    SetActive();   
-    if ( iIapParametersArray->Count() )
-        {
-        //another cm, another round
-        SetNextStateAndComplete( EWiFiProtCreateAllIaps ); 
-        }
-     else
-        {
-        //cm creation finished
-        SetNextStateAndComplete( EWiFiProtDestroyWaitNote ); 
-        }    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::CreateIapL
-// --------------------------------------------------------------------------
-//
-TUint32 CWiFiProtActiveRunner::CreateIapL( const TInt aIndex )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::CreateIapL" );
-    
-    TInt32 iapID = 0;
-    if ( iIapParametersArray->Count() )
-        {
-        RCmConnectionMethodExt cm;
-        cm = iCmManagerExt->CreateConnectionMethodL( KUidWlanBearerType );
-        CleanupClosePushL(cm);
-        iapID = SetIapDataL( aIndex, cm );
-        CleanupStack::Pop( &cm ); 
-        
-        RCmConnectionMethodExt* cmToAppend =
-                 new (ELeave) RCmConnectionMethodExt(cm);
-        CleanupStack::PushL(cmToAppend);
-        iCmArray.Append( cmToAppend ); //ownership transferred
-        CleanupStack::Pop( cmToAppend ); 
-        CLOG_WRITEF( _L("Cm appended to array: ") );
-
-
-        (*iIapParametersArray).Delete(aIndex);
-        }
-    
-       
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::CreateIapL" );
-    
-    return iapID;
-    }
-
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::SetIapDataL
-// --------------------------------------------------------------------------
-//
-TUint32 CWiFiProtActiveRunner::SetIapDataL( const TInt aIndex,
-                                           RCmConnectionMethodExt& aCmToSet )
-    {
-            // We have to convert the 8-bit SSID to 16-bit for CommsDat.
-        HBufC* ssid16 =
-             HBufC::NewLC( ( *iIapParametersArray)[aIndex].iSsid.Length() );
-        TPtr ssid16Ptr( ssid16->Des() );
-        CnvUtfConverter::ConvertToUnicodeFromUtf8(
-                 ssid16Ptr , (*iIapParametersArray)[aIndex].iSsid ); 
-        
-        aCmToSet.SetStringAttributeL( ECmName, *ssid16 );
-        aCmToSet.SetStringAttributeL( EWlanSSID, *ssid16 );
-        CLOG_WRITEF( _L("Parameters from wlan mgmt engine: ") );
-        CLOG_WRITEF( _L("SSid: ") );
-        CLOG_WRITEF( *ssid16 );
-        CleanupStack::PopAndDestroy( ssid16 );
-
-        TInt connMode = EAdhoc;
-        switch ( (*iIapParametersArray)[aIndex].iOperatingMode )
-            {
-            case EWlanOperatingModeAdhoc:
-                {
-                CLOG_WRITEF( _L("Operating Mode: Adhoc") );
-                break;
-                }
-            case EWlanOperatingModeInfrastructure:
-                {
-                CLOG_WRITEF( _L("Operating Mode: Infra") );
-                connMode = EInfra;
-                break;
-                }
-            default:
-                {
-                CLOG_WRITEF( _L("Operating Mode: Not Supported") );
-                User::Leave( KErrNotSupported );            
-                break;
-                }
-            }
-        aCmToSet.SetIntAttributeL( EWlanConnectionMode, connMode );
-
-        CMManager::TWlanSecMode secMode = EWlanSecModeOpen;
-        switch( (*iIapParametersArray)[aIndex].iSecurityMode )
-            {
-            case EWlanIapSecurityModeAllowUnsecure:
-                {
-                CLOG_WRITEF( _L("Security Mode: Open") );
-                secMode = EWlanSecModeOpen;
-                break;
-                }
-            
-            case EWlanIapSecurityModeWep:
-                {
-                CLOG_WRITEF( _L("Security Mode: Wep") );
-                secMode = EWlanSecModeWep;
-                break;
-                }
-            
-            case EWlanIapSecurityMode802d1x:
-                {
-                CLOG_WRITEF( _L("Security Mode: 802_1x") );
-                secMode = EWlanSecMode802_1x;
-                break;
-                }
-                
-            // EWlanIapSecurityModeWpa and 
-            // EWlanIapSecurityModeWpa2Only are handled as wpa            
-            case EWlanIapSecurityModeWpa: 
-            case EWlanIapSecurityModeWpa2Only:
-                {
-                CLOG_WRITEF( _L("Security Mode: wpa") );
-                secMode = EWlanSecModeWpa;
-                break;
-                }
-            
-            default:
-                {
-                User::Leave( KErrNotSupported );
-                }
-            }
-
-        aCmToSet.SetIntAttributeL( EWlanSecurityMode, secMode );
-
-        aCmToSet.UpdateL();
-        TInt32 wlanServId = aCmToSet.GetIntAttributeL( ECmIapServiceId );
-        TInt32 iapID = aCmToSet.GetIntAttributeL( ECmId );
-
-        CommsDat::CMDBSession* db =
-             CommsDat::CMDBSession::NewL(
-                     CommsDat::CMDBSession::LatestVersion() );
-        CleanupStack::PushL( db );
-
-        switch( (*iIapParametersArray)[aIndex].iSecurityMode )
-            {
-            case EWlanIapSecurityModeWep:
-                {
-                SaveWepSecuritySettingsL(
-                         ( *iIapParametersArray )[aIndex], wlanServId, *db );
-                break;
-                }
-            // EWlanIapSecurityModeWpa and 
-            // EWlanIapSecurityModeWpa2Only are handled as wpa                
-            case EWlanIapSecurityModeWpa:
-            case EWlanIapSecurityModeWpa2Only:        
-                {
-                CWPASecuritySettings* wpaSecSettings =
-                     CWPASecuritySettings::NewL( ESecurityModeWpa );
-                CleanupStack::PushL( wpaSecSettings );    
-                if ((*iIapParametersArray)
-                        [aIndex].iWpaPreSharedKey != KNullDesC8)
-                    {
-                    TBuf<KWlanWpaPskMaxLength> wpaBuf16;
-                    wpaBuf16.Copy((*iIapParametersArray)
-                        [aIndex].iWpaPreSharedKey);           
-                    User::LeaveIfError(
-                            wpaSecSettings->SetWPAPreSharedKey( wpaBuf16 ) );
-                    CLOG_WRITEF( _L("wpa psk set: ") );
-                    CLOG_WRITEF( wpaBuf16 );
-                    
-                    }
-                
-                TTypeOfSaving typeOfSaving = ESavingBrandNewAP;
-                    
-                if ( iapID == iCmManagerExt->EasyWlanIdL() )
-                    {
-                    typeOfSaving = ESavingEditedAP;
-                    }
-                    
-                wpaSecSettings->SaveL( wlanServId, *db,
-                                         typeOfSaving, 0 ) ;    
-                
-                CleanupStack::PopAndDestroy( wpaSecSettings );         
-                break;
-                }
-            // EWlanIapSecurityMode802d1x and 
-            // EWlanConnectionSecurityOpen - no key needs to be saved                
-            case EWlanIapSecurityMode802d1x:
-            case EWlanConnectionSecurityOpen:
-            default:
-                {
-                break;
-                }
-            }
-
-        db->Close();
-        CleanupStack::PopAndDestroy( db ); 
-    return iapID;
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::CleanupTempIapL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::CleanupTempIapL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::CleanupTempIapL" );
-    
-    //we don't need the temp iap anymore, delete it
-    //shouldn't be any errors, because nobody else knows about our temp iap
-    DeleteTempIapL();
-    SetActive();    
-    iStatus = KRequestPending; //should be set by service provider
-    if ( iError == KErrNone )
-        {
-        if ( iIsConnectionNeeded )
-            {
-            StartWlanScan(); //scan wlan before we close the wait dialog
-            }
-         else
-            {
-            //start creating iaps
-            SetNextStateAndComplete( EWiFiProtCreateAllIaps ); 
-            }
-        }
-    else
-       {
-       //don't create iaps or scan wlan, we had an error!
-       SetNextStateAndComplete( EWiFiProtDestroyWaitNote ); 
-       }
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::CleanupTempIapL" );
-    
-    } 
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::DeleteTempIapL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::DeleteTempIapL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::DeleteTempIapL" );
-    
-    if ( iTempIapId )
-        {
-        const TInt KInvalidUid = 0;
-        
-        CLOG_WRITE( "Calling iCmManagerExt->ConnectionMethodL" );
-        
-        RCmConnectionMethodExt cm =
-                             iCmManagerExt->ConnectionMethodL(iTempIapId);
-        
-        CLOG_WRITE( "Calling cm.DeleteL" );
-        
-        TRAPD(err, cm.DeleteL());
-        CLOG_WRITEF( _L("Temp Iap deleted! Error code: %d"), err );
-        cm.Close();
-        iTempIapId = KInvalidUid;
-        }
-        
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::DeleteTempIapL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::IsWepFormatHexL
-// --------------------------------------------------------------------------
-//
-TBool CWiFiProtActiveRunner::IsWepFormatHexL( TInt aLength )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::IsWepFormatHexL" );
-
-    if ( ( aLength == KConnUiUtilsWepLengthASCII5 ) ||
-        ( aLength == KConnUiUtilsWepLengthASCII13 ) ||
-        ( aLength == KConnUiUtilsWepLengthASCII29 ) )
-        {
-        return EFalse;
-        }
-    else if ( ( aLength == KConnUiUtilsWepLengthHEX10 ) ||
-        ( aLength == KConnUiUtilsWepLengthHEX26 ) ||
-        ( aLength == KConnUiUtilsWepLengthHEX58 ) )
-        {
-        return ETrue;
-        }
-    else
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::IsWepFormatHexL" );
-            
-    return EFalse;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::SaveWepSecuritySettingsL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::SaveWepSecuritySettingsL(
-                                 TWlanProtectedSetupCredentialAttribute
-                                         aCredentialAttribute, 
-                                 TUint32 aWlanServiceId,
-                                 CommsDat::CMDBSession& aDb )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::SaveWepSecuritySettingsL" );
-    
-    CWEPSecuritySettings* wepSecSettings = CWEPSecuritySettings::NewL( );
-    CleanupStack::PushL( wepSecSettings );    
-    TInt keyIndex = 0;
-    // wep key 1
-    SetWepKeyL( *wepSecSettings, aCredentialAttribute.iWepKey1, keyIndex );
-    keyIndex++;
-    // wep key 2
-    SetWepKeyL( *wepSecSettings, aCredentialAttribute.iWepKey2, keyIndex );
-    keyIndex++;
-    // wep key 3
-    SetWepKeyL( *wepSecSettings, aCredentialAttribute.iWepKey3, keyIndex );
-    keyIndex++;
-    // wep key 4
-    SetWepKeyL( *wepSecSettings, aCredentialAttribute.iWepKey4, keyIndex );
-       
-    //should be the same enum       
-    wepSecSettings->SetKeyInUse( (CWEPSecuritySettings::TWEPKeyInUse)
-                                 aCredentialAttribute.iWepDefaultKey );
-    CLOG_WRITEF( _L("Wep key in use %d:"),
-             aCredentialAttribute.iWepDefaultKey );
-                                 
-    CWEPSecuritySettings::TWEPAuthentication auth =
-             CWEPSecuritySettings::EAuthOpen;
-                                    
-    switch( aCredentialAttribute.iAuthenticationMode )
-        {
-        case EWlanAuthenticationModeOpen:
-            {
-            CLOG_WRITEF( _L("Authentication mode: open") );
-            break;
-            }
-        case EWlanAuthenticationModeShared:
-            {
-            CLOG_WRITEF( _L("Authentication mode: shared") );
-            auth = CWEPSecuritySettings::EAuthShared;
-            break;
-            }
-        default:
-            {
-            break;
-            }
-        }
-                    
-    //should be the same enum                    
-    wepSecSettings->SetAuthentication(
-         (CWEPSecuritySettings::TWEPAuthentication) auth );
-    wepSecSettings->SaveL( aWlanServiceId, aDb ) ;    
-    CleanupStack::PopAndDestroy( wepSecSettings );         
-
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::SaveWepSecuritySettingsL" );
-
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::HandleErrorL()
-// --------------------------------------------------------------------------
-//
-TBool CWiFiProtActiveRunner::HandleErrorL( TInt aErrorCode )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::HandleErrorL" );
-    
-    CLOG_WRITEF( _L("Error code: %d"), aErrorCode );
-    if (iWaitDlg) //close dialog first
-        {
-        TInt error = iStatus.Int();
-        iStatus = KRequestPending; //should be set by service provider
-        SetActive( );
-        SetNextStateAndComplete( EWiFiProtDestroyWaitNote , error );    
-        
-        CLOG_LEAVEFN( "CWiFiProtActiveRunner::HandleErrorL" );    
-        
-        return ETrue;    
-        }
-    else
-        {
-        TWiFiProtStates nextState = EWiFiProtFinished;
-        TInt textResId = 0;
-        TInt status = KErrCancel;
-        TBool ret = ETrue;
-        switch (aErrorCode)
-            {
-            // Error codes are in the original order
-            case KErrWlanProtectedSetupOOBInterfaceReadError:
-            case KErrWlanProtectedSetupDecryptionCRCFailure:
-            // the same handling here for this error code too
-                {
-                textResId = R_QTN_ERR_WLAN_SC_CONFIG_FAILED_TRY_AGAIN;  
-                break;
-                }
-            case KErrWlanProtectedSetup5_0ChannelNotSupported:
-            case KErrWlanProtectedSetup2_4ChannelNotSupported:
-            // the same handling here for this error code too
-                {
-                textResId = R_QTN_ERR_WLAN_SC_CONFIG_FAILED;  
-                break;
-                }
-            case KErrWlanSignalTooWeak:
-                {
-                textResId = R_QTN_ERR_WLAN_SIGNAL_TOO_WEAK;  
-                break;
-                }
-            case KErrWlanProtectedSetupNetworkAuthFailure:
-                {
-                status = KErrNone;
-                textResId = R_QTN_ERR_WLAN_SC_CONFIG_FAILED_TRY_AGAIN;
-                if ( iUsePin )
-                    {
-                    // ...pin code dialog if pin code was used
-                    nextState = EWiFiProtUsePinCode;
-                    }
-                else
-                    {
-                    // ... or initiate WPS dialog if push button was used
-                    nextState = EWiFiProtInitiateEasySetup;
-                    } 
-                break;
-                }
-            case KErrWlanProtectedSetupNetworkAssociationFailure:
-                {
-                textResId = R_QTN_ERR_WLAN_NETWORK_NOT_FOUND;  
-                break;
-                }
-            case KErrWlanProtectedSetupNoDHCPResponse:
-            case KErrWlanProtectedSetupFailedDHCPConfig:
-            // the same handling here for this error code too
-            case KErrWlanProtectedSetupIPAddressConflict:
-            // the same handling here for this error code too
-            case KErrWlanProtectedSetupCouldNotConnectToRegistrar:
-            // the same handling here for this error code too
-                {
-                textResId = R_QTN_ERR_WLAN_SC_CONFIG_FAILED;  
-                break;
-                }
-            case KErrWlanProtectedSetupMultiplePBCSessionsDetected:
-                {
-                nextState = EWiFiProtInitiateEasySetup;
-                status = KErrNone;
-                textResId =
-                 R_QTN_ERR_WLAN_SC_CONFIG_FAILED_MULTIPLE_PB_SESSIONS;  
-                break;
-                }
-            case KErrWlanProtectedSetupRogueActivitySuspected:
-                {
-                nextState = EWiFiProtUsePinCode;
-                iUsePin = ETrue;
-                status = KErrNone;
-                textResId =
-                 R_QTN_ERR_WLAN_SC_CONFIG_FAILED_ROGUE_ACTIVITY;  
-                break;
-                }            
-            case KErrWlanProtectedSetupDeviceBusy:
-            case KErrWlanProtectedSetupSetupLocked:
-            // the same handling here for this error code too
-            case KErrWlanProtectedSetupMessageTimeout:
-            // the same handling here for this error code too
-                {
-                textResId = R_QTN_ERR_WLAN_SC_CONFIG_FAILED_TRY_AGAIN;  
-                break;
-                }
-            case KErrWlanProtectedSetupRegistrationSessionTimeout:
-                {
-                textResId = R_QTN_ERR_WLAN_SC_CONFIG_FAILED_TRY_AGAIN;  
-                status = KErrNone;
-                // Registration session timeout, return to ...
-                if ( iUsePin )
-                    {
-                    // ...pin code dialog if pin code was used
-                    nextState = EWiFiProtUsePinCode;
-                    }
-                else
-                    {
-                    // ... or initiate WPS dialog if push button was used
-                    nextState = EWiFiProtInitiateEasySetup;
-                    }
-                break;
-                }
-            case KErrWlanProtectedSetupDevicePasswordAuthFailure:
-                {
-                status = KErrNone;
-                textResId = R_QTN_ERR_WLAN_SC_CONFIG_FAILED_TRY_AGAIN;
-                if ( iUsePin )
-                    {
-                    // ...pin code dialog if pin code was used
-                    nextState = EWiFiProtUsePinCode;
-                    }
-                else
-                    {
-                    // ... or initiate WPS dialog if push button was used
-                    nextState = EWiFiProtInitiateEasySetup;
-                    } 
-                break;
-                }
-            case KErrWlanProtectedSetupPINMethodNotSupported:
-                {
-                textResId =
-                 R_QTN_ERR_WLAN_SC_CONFIG_FAILED_PIN_NOT_SUPPORTED;  
-                break;
-                }
-            case KErrWlanProtectedSetupPBMethodNotSupported:
-                {
-                textResId =
-                 R_QTN_ERR_WLAN_SC_CONFIG_FAILED_PB_NOT_SUPPORTED;  
-                break;
-                } 
-            case KErrWlanConnAlreadyActive:
-                {
-                textResId = R_QTN_WLAN_INFO_CONNECTION_ALREADY_ACTIVE;  
-                break;
-                }
-            default:
-                {
-                ret = EFalse;
-                }
-            }
-        if (ret)    
-            {
-            HBufC* text = StringLoader::LoadLC( textResId );
-            CLOG_WRITEF( *text );
-            CAknNoteDialog* dlg = new (ELeave) CAknNoteDialog(
-                                     CAknNoteDialog::EErrorTone,
-                                     CAknNoteDialog::ELongTimeout );
-            dlg->SetTextL( *text );
-            CleanupStack::PopAndDestroy( text );   
-            iStatus = KRequestPending; //should be set by service provider
-            SetActive( );
-            dlg->ExecuteLD( R_WIFIPROT_ERROR_NOTE  ); 
-            SetNextStateAndComplete( nextState , status );
-            }
-            
-        CLOG_LEAVEFN( "CWiFiProtActiveRunner::HandleErrorL" );    
-        
-        return ret;
-        }
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::ShowOfflineQuery
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ShowOfflineQuery()
-    {
-    iNextWiFiProtState = EWiFiProtInitiateEasySetup;
-
-    iNotifier.StartNotifierAndGetResponse(iStatus,KUidCOfflineWlanNoteDlg, 
-                                           KNullDesC8(), 
-                                           iOfflineReply );
-    SetActive();
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::HandleNoErrorL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::HandleNoErrorL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::HandleNoErrorL" );
-    
-    switch (iNextWiFiProtState)
-        {
-        case EWifiProtOfflineQuery :
-            {
-            ShowOfflineQuery();
-            break;
-            }
-        case EWiFiProtInitiateEasySetup :
-            {
-            ShowInitiateEasySetupDialogL();
-            break;
-            }
-        case EWiFiProtUsePinCode :
-            {
-            if ( iUsePin )
-                {
-                // dismiss the link dialog now
-                if ( iDestroyInitDialogLater )
-                    {
-                    iInitDialog->TryExitL( EAknSoftkeyView );
-                    iDestroyInitDialogLater = EFalse;
-                    }
-                ShowEnterPinOnStationDialogL();
-                }
-            else
-                {
-                iStatus = KRequestPending;
-                SetActive( );
-                SetNextStateAndComplete( EWiFiProtStartingWaitDlg );
-                }
-            break;                
-            }
-        case EWiFiProtStartingWaitDlg :
-            {
-            ShowWaitingDialogAndProceedL( );
-            break;
-            }
-        case EWiFiProtConfiguring :
-            {
-            ConfigureL();
-            break;
-            }
-        case EWiFiProtCreateAllIaps :
-            {
-            CreateAllIapsL();
-            break;
-            }
-
-        // when we are here, wlan scan is finished                    
-        case EWiFiProtWlanScan :              
-            {
-            iORequest = EWiFiProtReqNone;
-            iStatus = KRequestPending;
-            SetActive( );
-            SetNextStateAndComplete( EWiFiProtDestroyWaitNote );
-            break;
-            }
-        case EWiFiProtSelectConnection :                   
-            {
-            SelectConnectionL();                   
-            break;
-            }
-            
-        case EWiFiProtSettingsConfNote  :
-            {
-            ShowFinalNoteL( );
-            break;
-            }
-        case EWiFiProtFinished  :
-            {
-            iReturn = EWiFiOK;
-
-            if ( iIsConnectionNeeded )
-                {
-                *iNetworkSettings = (*iIapParametersArray)[
-                    iAvailableNetworks[iSelectedNetworkIndex] ];
-                }
-            else
-                {
-                // Copy the results into the output array
-                for (TInt i = 0; i< iCmArray.Count();i++ )
-                    {
-                    CLOG_WRITEF( _L(
-                  "Copy the results into the output array, i == %d"), i );
-                    if ( iUids == NULL)
-                        {
-                        User::Panic( KWiFiPanic, KErrNotSupported );
-                        }
-                    iUids->Append( iCmArray[i]->GetIntAttributeL( ECmId ) );
-                    }
-                }
-            
-            if ( iSyncMode )
-                {
-                if (iWait.IsStarted() )
-                    {
-                    iWait.AsyncStop();
-                    }
-                }
-            else
-                {
-                iParent->CompleteProcessL( iReturn );
-                }
-            break;
-            }
-        default:
-            {
-            //should not ever get here
-            CLOG_WRITE( "Unhandled WiFiProtState!!!" );
-            User::Leave( KErrGeneral );
-            break;
-            }
-        }
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::HandleNoErrorL" );
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::PinQueryExitL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::PinQueryExitL( TInt aResponse )
-    {
-    iPinQueryActive = EFalse;
-    iPinDlg = NULL;
-    if ( aResponse  == KErrNone )
-        {
-            
-        if ( iWaitNoteNeeded )
-            {
-            ShowWaitingDialogL();
-            }
-        else
-            {
-            EvaluateResult(); //we were just waiting for PIN query to exit
-            }
-        }
-    else
-        {
-        iUserCancelled = ETrue;
-        CancelOngoingRequest();        
-        }
-    }
-
-// --------------------------------------------------------------------------
-// void CWiFiProtActiveRunner::DoUsePinCodeLinkSelectedL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::DoUsePinCodeLinkSelectedL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::DoUsePinCodeLinkSelectedL" );
-    if ( !iDestroyInitDialogLater )
-        {
-        iUsePin = ETrue;
-        TRequestStatus* pS = &iStatus;                
-        User::RequestComplete( pS, KErrNone );
-        iDestroyInitDialogLater = ETrue;
-        }
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::DoUsePinCodeLinkSelectedL" );
-    }
-    
-// --------------------------------------------------------------------------
-// void CWiFiProtActiveRunner::StartWlanScan()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::StartWlanScan()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::StartWlanScan" );
-    // this flag is needed to store the cancel because we cannot
-    // cancel wlan scan itself
-#ifdef __WINS__
-    SetNextStateAndComplete( EWiFiProtWlanScan );
-#else
-    iORequest = EWiFiProtReqWlanScan;
-    iNextWiFiProtState = EWiFiProtWlanScan;
-    iWlanMgmtEngine->GetScanResults( iStatus, *iScanInfo );
-#endif
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::StartWlanScan" );
-    }
-    
-// --------------------------------------------------------------------------
-// void CWiFiProtActiveRunner::CheckNetworkAvailabilityL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::CheckNetworkAvailabilityL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::CheckNetworkAvailabilityL" );
- 
-    iAvailableNetworks.Reset();
-    TBool found = EFalse;
-    for (TInt i = 0; i < iIapParametersArray->Count(); i++ )
-        {  
-        found = EFalse;
-#ifdef __WINS__        
-        for (TInt j = 0; j<KNumberOfEmulatedAvailableNetworks; j++)
-#else
-        for ( iScanInfo->First(); (!iScanInfo->IsDone())
-                        && (!found); iScanInfo->Next() )
-#endif        
-            {
-            TUint8 ieLen( 0 );
-            const TUint8* ieData;
-            TBuf8<KWlanMaxSsidLength> ssid8;
-#ifdef __WINS__        
-            TBuf8<KWlanMaxSsidLength> ssidData;
-            ieData = ssidData.PtrZ();
-            switch (j)
-                {
-                case KIndexOfFirstEmulatedAvailableNetwork:
-                    {
-                    ssidData = _L8("Available Network");
-                    break;
-                    }
-                case KIndexOfSecondEmulatedAvailableNetwork:
-                    {
-                    ssidData = _L8("Available Network 2");
-                    break;
-                    }
-                default:
-                    {
-                    User::Panic( KWiFiPanic , KErrNotFound );
-                    break;
-                    }
-                }
-            ieLen = ssidData.Length();     
-            TInt ret = KErrNone;
-#else
-            TInt ret = iScanInfo->InformationElement( E802Dot11SsidIE, ieLen,
-                                                     &ieData );
-#endif        
-            User::LeaveIfError( ret );
-            if ( ieLen )
-                {
-                CLOG_WRITE( "Starting copying ssid" );  
-                // get the ssid
-                ssid8.Copy( ieData, ieLen );
-                CLOG_WRITE( "SSID copied" );  
-                if ( !(*iIapParametersArray)[i].iSsid.Compare( ssid8 ) )
-                    {
-                    iAvailableNetworks.Append(i);
-                    found = ETrue;
-                    }
-                }
-            }
-        }
-            
-        if (iAvailableNetworks.Count() == 1)
-            {
-            // only one network available, go to confirmation note
-            iSelectedNetworkIndex = 0;
-            SetNextStateAndComplete( EWiFiProtSettingsConfNote );
-            }
-        else if (iAvailableNetworks.Count() > 1)
-            {
-            // more are available, select connection dialog
-            SetNextStateAndComplete( EWiFiProtSelectConnection );
-            }
-        else
-            {
-            // no wlan networks found note
-            ShowNoWlanNetworksNoteL();
-            }
-
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::CheckNetworkAvailabilityL" );
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::SelectConnection
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::SelectConnectionL( )
-    {
-    CDesCArrayFlat* items =
-         new ( ELeave ) CDesCArrayFlat( KArrayGranularity );
-    CleanupStack::PushL( items );
-    
-    _LIT( KListBoxItemFormat, "%d\t%s\t" );
-    const TInt KListBoxItemFormatLength = 4;
-    TBuf<KWlanMaxSsidLength+KListBoxItemFormatLength+1> buf;
-    for (TInt i = 0; i < iAvailableNetworks.Count(); i++ )
-        {
-        // We have to convert the 8-bit SSID to 16-bit 
-        HBufC* ssid16 = HBufC::NewLC( (*iIapParametersArray)
-            [iAvailableNetworks[i]].iSsid.Length()+1 );
-        TPtr ssid16Ptr( ssid16->Des() );
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16Ptr,
-            (*iIapParametersArray)[iAvailableNetworks[i]].iSsid );
-        ssid16Ptr.ZeroTerminate();
-        buf.Format( KListBoxItemFormat,
-             0/*we use only one icon*/, ssid16->Ptr() ); 
-        CleanupStack::PopAndDestroy( ssid16 );        
-        items->AppendL(buf);
-        }
-    CAknIconArray* icons = new( ELeave ) CAknIconArray( KIconsGranularity );
-    CleanupStack::PushL( icons );
-    //creating icon    
-    TAknsItemID id;
-    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-           
-    TParse mbmFile;
-    User::LeaveIfError( mbmFile.Set( KWiFiFileIcons, 
-                        &KDC_BITMAP_DIR,
-                        NULL ) );
-    
-    CGulIcon* icon = AknsUtils::CreateGulIconL( 
-                        skinInstance, 
-                        id,
-                        mbmFile.FullName(), 
-                        EMbmWifiprotQgn_prop_wlan_bearer, 
-                        EMbmWifiprotQgn_prop_wlan_bearer_mask );
-    ///                                
-    
-    CleanupStack::PushL(icon);
-    icons->AppendL( icon );
-    CleanupStack::Pop();  //icon array takes ownership
-    // we are finished, don't create any iaps in connection mode!
-    iNextWiFiProtState = EWiFiProtFinished;
-    CWiFiProtSelectNetworkDlg* dlg =
-         new ( ELeave ) CWiFiProtSelectNetworkDlg(iStatus ,
-                                                  iSelectedNetworkIndex,
-                                                  items, icons );
-    CleanupStack::Pop( icons ); // list takes ownership
-    CleanupStack::Pop( items );// list takes ownership
-    dlg->PrepareAndRunLD(  );
-    SetActive();
-    }
-
-// --------------------------------------------------------------------------
-// void CWiFiProtActiveRunner::ShowNoWlanNetworksNoteL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::ShowNoWlanNetworksNoteL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::ShowNoWlanNetworksNoteL" );
-    HBufC* stringLabel = StringLoader::LoadLC( 
-                                         R_QTN_WLAN_INFO_NO_NETWORKS_FOUND );
-
-    RAknUiServer* globalNote = CAknSgcClient::AknSrv();
-    if ( globalNote->Handle() )
-        {
-        globalNote->ShowGlobalNoteL( *stringLabel, 
-                                    EAknGlobalInformationNote );
-        }
-    CleanupStack::PopAndDestroy( stringLabel );
-    SetNextStateAndComplete( EWiFiProtFinished );
-
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::ShowNoWlanNetworksNoteL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::CancelOngoingRequest
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::CancelOngoingRequest()
-    {
-    
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::CancelOngoingRequest" );
-    
-    switch ( iORequest )
-        {
-        case EWiFiProtReqConfirmDialog:
-            {
-            // Remove the showing dialog and cancel the request
-            delete iConfirmationDialog;
-            iConfirmationDialog = NULL;
-            TRequestStatus* pS = &iStatus;                
-            User::RequestComplete( pS, KErrCancel );
-            break;
-            }
-        case EWiFiProtReqInitDialog:
-            {
-            // Remove the showing dialog and cancel the request
-            delete iInitDialog;
-            iInitDialog = NULL;
-            TRequestStatus* pS = &iStatus;                
-            User::RequestComplete( pS, KErrCancel );
-            break;
-            }       
-        case EWiFiProtReqWPS :
-            {
-            if ( iPinQueryActive )
-                {
-                delete iPinDlg;
-                iPinDlg = NULL;
-                }           
-            if ( iWlanMgmtEngine )
-                {
-                CLOG_WRITE( "Calling WPS cancel!" );
-                iWlanMgmtEngine->CancelProtectedSetup();
-                CLOG_WRITE( "WPS cancel called!" );
-                }
-            break;
-            }
-        case EWiFiProtReqWlanScan :
-            {
-            iWlanMgmtEngine->CancelGetScanResults();
-            break;
-            }    
-        case EWiFiProtReqNone :
-            {
-            // it is possible, especially in emulator, that the pin dialog
-            // is still visible at this point
-            if ( iPinQueryActive )
-                {
-                delete iPinDlg;
-                iPinDlg = NULL;
-                TRequestStatus* pS = &iStatus;                
-                User::RequestComplete( pS, KErrCancel );
-                }
-            // set CancelCalled flag to make RunL start shutdown next time
-            iUserCancelled = ETrue;
-            break;
-            }
-            
-        default:
-            {
-            // should not ever get here
-            }
-        }
-    
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::CancelOngoingRequest" );
-    
-    } 
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::SetWepKeyL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::SetWepKeyL( CWEPSecuritySettings&
-                                            aWepSecSettings,
-                                        TWlanWepKey& aWepKey,
-                                        TInt aKeyNumber )
-    {
-    if ( aWepKey != KNullDesC8)
-        {
-        TBool wepKeyInAsciiFormat = IsWepFormatHexL( aWepKey.Length() );
-        TBuf<KWlanWepKeyMaxLength> wepBuf16;
-        wepBuf16.Copy( aWepKey );           
-        User::LeaveIfError(aWepSecSettings.SetKeyDataL( aKeyNumber, wepBuf16,
-                                         wepKeyInAsciiFormat ) );
-        CLOG_WRITEF( _L("Wep key: %d"), aKeyNumber );
-        CLOG_WRITEF( wepBuf16 );
-        }
-    }
-    
-// --------------------------------------------------------------------------
-// TInt CWiFiProtActiveRunner::UsePinCodeLinkSelectedL()
-// --------------------------------------------------------------------------
-//
-TInt CWiFiProtActiveRunner::UsePinCodeLinkSelectedL( TAny* aObject )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveRunner::UsePinCodeLinkSelectedL" );
-    CWiFiProtActiveRunner* myself =
-                            static_cast<CWiFiProtActiveRunner*>( aObject );
-    myself->DoUsePinCodeLinkSelectedL();
-    CLOG_LEAVEFN( "CWiFiProtActiveRunner::UsePinCodeLinkSelectedL" );
-
-    return 1;
-    }    
-// End of File  
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotconfirmationnotedlg.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtConfirmationNoteDlg.
-*
-*/
-
-/*
-* %version: tr1cfwln#6 %
-*/
-
-// INCLUDE FILES
-//system includes
-#include <uikon/eiksrvui.h>
-
-//user includes
-#include "wifiprotconfirmationnotedlg.h"
-#include "wifiprotdlgsplugin.h"
-#include "wifiprotplugin.hrh"
-
-// ========================== MEMBER FUNCTIONS ==============================
-//
-// --------------------------------------------------------------------------
-// CWiFiProtConfirmationNoteDlg::CWiFiProtConfirmationNoteDlg
-// --------------------------------------------------------------------------
-//
-CWiFiProtConfirmationNoteDlg::CWiFiProtConfirmationNoteDlg(
-                                                   TRequestStatus& aStatus ):
-                                                    iRequestStatus( aStatus )
-    {
-    iRequestStatus = KRequestPending;
-    }
-    
-    
-// --------------------------------------------------------------------------
-// CWiFiProtConfirmationNoteDlg::~CWiFiProtConfirmationNoteDlg
-// --------------------------------------------------------------------------
-//
-CWiFiProtConfirmationNoteDlg::~CWiFiProtConfirmationNoteDlg()
-    {
-    STATIC_CAST( CEikServAppUi*, 
-                CCoeEnv::Static()->AppUi() )->SuppressAppSwitching( EFalse );
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtInitiateEasySetupDlg::ProcessCommandL()
-// --------------------------------------------------------------------------
-//    
-void CWiFiProtConfirmationNoteDlg::ProcessCommandL( TInt aCommandId )
-    {
-    switch ( aCommandId )
-        {
-        case EWiFiSoftkeyContinue: //should use callback but it doesn't work
-            {
-            TryExitL(aCommandId);           
-            break;              
-            }
-        default:
-            {
-            CAknQueryDialog::ProcessCommandL( aCommandId );
-            break;
-            }
-        }    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtConfirmationNoteDlg::OkToExitL
-// --------------------------------------------------------------------------
-//
-TBool CWiFiProtConfirmationNoteDlg::OkToExitL( TInt aButtonId )
-    {
-    TInt status = KErrCancel;
-    if (aButtonId == EAknSoftkeyOk
-         || aButtonId == EAknSoftkeyYes
-         || aButtonId == EAknSoftkeyDone 
-         || aButtonId == EWiFiSoftkeyContinue )
-        {
-        status = KErrNone;
-        }
-    else if ( aButtonId == EAknSoftkeyNo )
-        {
-        status = KErrCancel; // no selected
-        }
-    else
-        {
-        status = KErrAbort; // end key pressed
-        }
-     
-    TRequestStatus* pS = &iRequestStatus;                
-    User::RequestComplete( pS, status ); 
-    return ETrue;
-    }
-    
-    
-// --------------------------------------------------------------------------
-// CWiFiProtConfirmationNoteDlg::PreLayoutDynInitL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtConfirmationNoteDlg::PreLayoutDynInitL()
-    {
-    CAknQueryDialog::PreLayoutDynInitL();
-    STATIC_CAST( CEikServAppUi*, 
-                CCoeEnv::Static()->AppUi() )->SuppressAppSwitching( ETrue );
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotdlgsplugin.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,461 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of CWiFiProtDlgsPlugin.
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-// INCLUDE FILES
-#include <e32property.h>         // For RProperty 
-#include <wifiprotuiddefs.h>
-#include <bautils.h>
-#include <eikenv.h>
-#include <data_caging_path_literals.hrh>
-
-#include "wifiprotdlgsplugin.h"
-#include "wifiprotplugin.h"
-#include "wifiprotlogger.h"
-#include "wifiprotactiverunner.h"
-
-
-
-using namespace WiFiProt;
-
-// CONSTS
-_LIT( KDriveZ, "z:" );
-
-// ============================ MEMBER FUNCTIONS ============================
-    
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin* CWiFiProtDlgsPlugin::NewL()
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin* CWiFiProtDlgsPlugin::NewL( 
-                             const TBool aResourceFileResponsible,
-                                      RCmManagerExt* aCmManagerExt )
-
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::NewL" );
-    
-    CWiFiProtDlgsPlugin* self = new ( ELeave ) CWiFiProtDlgsPlugin();
-    CleanupStack::PushL( self );
-    self->ConstructL( KResourceFileName,
-                      aResourceFileResponsible, aCmManagerExt );
-    CleanupStack::Pop( self );
-    
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::NewL" );
-    
-    return self;
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin* CWiFiProtDlgsPlugin::NewL()
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin* CWiFiProtDlgsPlugin::NewL( 
-                                       const TBool aResourceFileResponsible )
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::NewL (without passed CmManager)" );
-    
-    CWiFiProtDlgsPlugin* ret =  NewL( aResourceFileResponsible, NULL );
-    
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::NewL (without passed CmManager)" );
-    
-    return ret;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin::~CWiFiProtDlgsPlugin
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin::~CWiFiProtDlgsPlugin( )
-
-    {    
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::~CWiFiProtDlgsPlugin" );
-    
-    delete iRunner;
-
-    //we didn't get a cmManager from the client, so use our own
-    if (iPassedCmManagerExt == NULL)
-        {
-        iCmManagerExt.Close();
-        }    
-
-    iUids.Close();
-
-    if ( iResource )
-        {
-        CCoeEnv::Static()->DeleteResourceFile( iResource );        
-        }
-
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::~CWiFiProtDlgsPlugin" );
-    
-    }  
-
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin::TNotifierInfo 
-//                                  CWiFiProtDlgsPlugin::Info() const
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin::TNotifierInfo CWiFiProtDlgsPlugin::Info() const
-    {
-    return iInfo;
-    }
-
-// --------------------------------------------------------------------------
-// TPtrC8 CWiFiProtDlgsPlugin::StartL()
-// --------------------------------------------------------------------------
-//
-TPtrC8 CWiFiProtDlgsPlugin::StartL( const TDesC8& /*aBuffer*/ )
-    {
-    CLOG_WRITE( "CWiFiProtDlgsPlugin::StartL" );
-    return KNullDesC8().Ptr();
-    }
-
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::Cancel()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::Cancel()
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::Cancel" );
-    
-    if ( !iCancelled )
-        {
-        if ( iRunner && !iCancelledFromInside )
-            {
-            iClientCancelled = ETrue;
-            iRunner->CancelByClient();
-            }
-        iCancelled = ETrue;
-        if ( !iMessage.IsNull() )
-            {
-            if ( iConnMode )
-                {
-                TRAP_IGNORE( iMessage.WriteL( iReplySlot,
-                         TPckg<WiFiProt::TWiFiConnOutputParams>( 
-                                TWlanProtectedSetupCredentialAttribute() )
-                         ));
-                }
-            else
-                {
-                TRAP_IGNORE( iMessage.WriteL( iReplySlot,
-                         TPckg<WiFiProt::TWiFiOutputParams>( KNullDesC8() )
-                         ));
-                }
-            iMessage.Complete( KErrCancel );
-            }
-        }
-        
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::Cancel" );
-    
-    }
-    
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::Release()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::Release()
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::Release" );
-
-    delete this;
-
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::Release" );
-    }
-
-// --------------------------------------------------------------------------
-// TPtrC8 CWiFiProtDlgsPlugin::UpdateL()
-// --------------------------------------------------------------------------
-//
-TPtrC8 CWiFiProtDlgsPlugin::UpdateL(const TDesC8& /*aBuffer*/)
-    {
-    return KNullDesC8().Ptr();
-    }
-
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::CompleteL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::CompleteL( TInt aStatus )
-    {    
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::CompleteL" );
-    
-    CLOG_WRITEF( _L( "aStatus:" ), aStatus );
-    iCancelled = ETrue;
-    if ( !iMessage.IsNull() )
-        {
-        if ( iConnMode )
-            {
-            // return a different kind of message
-            // for connection creation 
-            WiFiProt::TWiFiConnOutputParams connOutputParams =
-            WiFiProt::TWiFiConnOutputParams( iNetworkSettings );
-            connOutputParams.iReturn = iReturn;            
-            iMessage.WriteL( iReplySlot,
-                            TPckg<WiFiProt::TWiFiConnOutputParams>( connOutputParams ) );            
-            }
-        else
-            {
-            // ... or iap(s) creation
-            const TInt elementSize = sizeof(TUint32);
-            TBuf8<(KMaxNumberOfUids * elementSize)> buf;
-            TInt uidsCount = iUids.Count();
-            if ( uidsCount > KMaxNumberOfUids )
-                {
-                uidsCount = KMaxNumberOfUids;
-                }
-            // copy data from the array to iIapIds in TWiFiOutputParams
-            buf.Append((const TUint8 *)(&iUids[0]), uidsCount *elementSize);
-            //append return value
-            WiFiProt::TWiFiOutputParams outputParams =
-                WiFiProt::TWiFiOutputParams(buf);
-            outputParams.iReturn = iReturn;
-            iMessage.WriteL( iReplySlot,
-                            TPckg<WiFiProt::TWiFiOutputParams>( outputParams ) );
-            }
-        iMessage.Complete( aStatus );
-        }
-        
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::CompleteL" );
-    
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin::SetCancelledFlag
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::SetCancelledFlag( TBool aCancelled )
-    { 
-    iCancelled = aCancelled; 
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin::TNotifierInfo CWiFiProtDlgsPlugin::RegisterL()
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin::TNotifierInfo CWiFiProtDlgsPlugin::RegisterL()
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::RegisterL" );
-
-    iInfo.iUid = KUidWiFiProtSetup;
-    iInfo.iPriority = ENotifierPriorityHigh;
-    iInfo.iChannel = KUidWiFiProtSetup;
-    
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::RegisterL" );
-    
-    return iInfo;
-    }
-
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::StartL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::StartL( const TDesC8& aBuffer, 
-                                  TInt aReplySlot,
-                                  const RMessagePtr2& aMessage )
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::StartL" );
-    
-    TPckgBuf<TWiFiInputParams> pckgParams(
-                    TPckgBuf<TWiFiInputParams>(TWiFiInputParams(KNullDesC8(),
-                    EFalse))); 
-    pckgParams.Copy( *((TPckgBuf<TWiFiInputParams>*) (&aBuffer)));
-    TWiFiInputParams params((pckgParams)());
-    iConnMode = params.iConnectionNeeded;
-    TWlanSsid ssid;
-    ssid.Copy( params.iSSid );
-    
-    iCancelled = EFalse;
-
-    iReplySlot = aReplySlot;
-    iMessage = aMessage;
-
-    if ( iConnMode )
-        {
-        // no need for uid array to return, but we need a single network 
-        // settings struct
-        iRunner->StartProtectedSetupConnL( ssid, iNetworkSettings,
-                                                       CmManagerToUse());
-        }
-    else
-        {
-        iRunner->StartProtectedSetupAsyncL( ssid, iUids, CmManagerToUse() );
-        }
-        
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::StartL" );
-    }
-
-// --------------------------------------------------------------------------
-// WiFiProt::TWiFiReturn CWiFiProtDlgsPlugin::CompleteProcessL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::CompleteProcessL( WiFiProt::TWiFiReturn aReturnValue )
-    {
-    CLOG_ENTERFN( "WiFiProtDlgsPlugin::CompleteProcessL" );
-    iReturn = aReturnValue;
-    switch ( aReturnValue )
-        {
-        case EWiFiOK:
-            {
-            CLOG_WRITE("StartProtectedSetupL returned EWiFiOK");
-            CompleteL( KErrNone );
-            break;
-            }
-        case EWifiNoAuto:
-            {
-            CLOG_WRITE("StartProtectedSetupL returned EWifiNoAuto");
-            CompleteL( KErrNone );
-            break;
-            }
-        case EWiFiCancel:
-            {
-            CLOG_WRITE("StartProtectedSetupL returned EWiFiCancel");
-            iCancelledFromInside = ETrue;
-            Cancel();
-            break;
-            }
-        default:
-            {
-            //should never happen
-            CLOG_WRITE("Unhandled exit value, leaving...");
-            User::Leave( KErrGeneral );
-            break;
-            }
-        }
-    CLOG_WRITEF( _L( "Uids returned:" ), iUids.Count() );
-    for ( TInt i = 0;i<iUids.Count();i++ )
-        {
-        CLOG_WRITEF( _L( "Uid:" ), iUids[i] );
-        }
-        
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::CompleteProcessL" );
-    }
-
-    
-// --------------------------------------------------------------------------
-// WiFiProt::TWiFiReturn CWiFiProtDlgsPlugin::StartFromUiL
-// --------------------------------------------------------------------------
-//
-
-WiFiProt::TWiFiReturn CWiFiProtDlgsPlugin::StartFromUiL(
-                                        const TWlanSsid& aSSid,
-                                       TBool aConnectionNeeded,
-                                RArray<TUint32>& aUidsReturned)
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::StartFromUiL" );
-    
-    CLOG_WRITE("Input params:");
-    CLOG_WRITE("SSid:");
-    
-    TBuf<KWlanMaxSsidLength> buf;
-    buf.Copy(aSSid); 
-    CLOG_WRITEF( buf );
-    CLOG_WRITE("Connection needed:");
-    if ( aConnectionNeeded )
-        {
-        CLOG_WRITE("ETrue");
-        }
-     else
-        {
-        CLOG_WRITE("EFalse");
-        }
-    //use passed CmManager if present
-    WiFiProt::TWiFiReturn ret = iRunner->StartProtectedSetupL( 
-                  aSSid, aUidsReturned, CmManagerToUse());
-    
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::StartFromUiL" );
-    return ret;
-    }
-
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::CmManagerToUse()
-// --------------------------------------------------------------------------
-//
-RCmManagerExt& CWiFiProtDlgsPlugin::CmManagerToUse()
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::CmManagerToUse" );
-    
-    if (iPassedCmManagerExt == NULL )
-        {
-        CLOG_WRITE("Own CmManagerExt used");
-        
-        CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::CmManagerToUse" );
-        
-        return iCmManagerExt;
-        }
-     else
-        {
-        CLOG_WRITE("Passed CmManagerExt used");
-        
-        CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::CmManagerToUse" );
-        
-        return *iPassedCmManagerExt;
-        }
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin::CWiFiProtDlgsPlugin()
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin::CWiFiProtDlgsPlugin()
-: iCancelled( EFalse ),
-  iResource( 0 ),
-  iCancelledFromInside( EFalse )
-
-    {
-    CLOG_WRITE("CWiFiProtDlgsPlugin::CWiFiProtDlgsPlugin");
-    }
-    
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::ConstructL( )
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::ConstructL(const TDesC& aResourceFileName,
-                                     const TBool aResourceFileResponsible,
-                                     RCmManagerExt* aCmManagerExt )
-    {
-    CLOG_ENTERFN( "CWiFiProtDlgsPlugin::ConstructL" );
-    
-    if ( aResourceFileResponsible )
-        {
-        // Since this is a .DLL, resource files that are to be used by the
-        // notifier aren't added automatically so we do that here.
-        TFileName fileName;
-
-        fileName.Append( KDriveZ );
-        fileName.Append( KDC_RESOURCE_FILES_DIR );   
-        fileName.Append( aResourceFileName );
-
-        BaflUtils::NearestLanguageFile( CCoeEnv::Static()->FsSession(),
-                                        fileName );
-        iResource = CCoeEnv::Static()->AddResourceFileL( fileName );
-        }
-    
-    iPassedCmManagerExt = aCmManagerExt;
-    //we didn't get a cmManager from the client, so use our own
-    if (iPassedCmManagerExt == NULL)
-        {
-        iCmManagerExt.OpenL();
-        }
-    iRunner = CWiFiProtActiveRunner::NewL( this );
-    
-    CLOG_LEAVEFN( "CWiFiProtDlgsPlugin::ConstructL" );
-    
-    }
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotenterpindlg.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtEnterPinDlg.
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-// INCLUDE FILES
-//system includes
-#include <uikon/eiksrvui.h>
-
-//user includes
-#include "wifiprotenterpindlg.h"
-#include "wifiprotactiverunnercallback.h"
-#include "wifiprotplugin.hrh"
-
-
-// FORWARD DECLARATIONS
-//class MActiveRunnerCallback;
-
-// ================= MEMBER FUNCTIONS =======================
-//
-// --------------------------------------------------------------------------
-// CWiFiProtEnterPinDlg::CWiFiProtEnterPinDlg
-// --------------------------------------------------------------------------
-//
-CWiFiProtEnterPinDlg::CWiFiProtEnterPinDlg(
-                              MActiveRunnerCallback& aActiveRunnerCallback ):
-                              iActiveRunnerCallback ( aActiveRunnerCallback )
-    {
-    }
-    
-    
-// --------------------------------------------------------------------------
-// CWiFiProtEnterPinDlg::~CWiFiProtEnterPinDlg
-// --------------------------------------------------------------------------
-//
-CWiFiProtEnterPinDlg::~CWiFiProtEnterPinDlg()
-    {
-    STATIC_CAST( CEikServAppUi*, 
-                CCoeEnv::Static()->AppUi() )->SuppressAppSwitching( EFalse );
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtInitiateEasySetupDlg::ProcessCommandL()
-// --------------------------------------------------------------------------
-//    
-void CWiFiProtEnterPinDlg::ProcessCommandL( TInt aCommandId )
-    {
-    switch ( aCommandId )
-        {
-        case EWiFiSoftkeyContinue: 
-            {
-            TryExitL(aCommandId);           
-            break;              
-            }
-        default:
-            {
-            CAknQueryDialog::ProcessCommandL( aCommandId );
-            break;
-            }
-        }    
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtEnterPinDlg::OkToExitL
-// --------------------------------------------------------------------------
-//
-TBool CWiFiProtEnterPinDlg::OkToExitL( TInt aButtonId )
-    {
-    if (aButtonId == EAknSoftkeyEmpty)
-        {
-        return EFalse;
-        }
-    else
-        {
-        TInt status = KErrCancel;
-        if (   aButtonId == EAknSoftkeyOk
-            || aButtonId == EAknSoftkeyYes
-            || aButtonId == EAknSoftkeyDone
-            || aButtonId == EWiFiSoftkeyContinue )
-            {
-            status = KErrNone;
-            }
-        iActiveRunnerCallback.PinQueryExitL( status );
-        return ETrue;
-        }
-    }
-    
-    
-// --------------------------------------------------------------------------
-// CWiFiProtEnterPinDlg::PreLayoutDynInitL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtEnterPinDlg::PreLayoutDynInitL()
-    {
-    CAknQueryDialog::PreLayoutDynInitL();
-    STATIC_CAST( CEikServAppUi*, 
-                CCoeEnv::Static()->AppUi() )->SuppressAppSwitching( ETrue );
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtEnterPinDlg::RemoveCancel
-// --------------------------------------------------------------------------
-//
-void CWiFiProtEnterPinDlg::RemoveCancel()
-    {
-    CEikButtonGroupContainer& cba = ButtonGroupContainer();
-    TRAP_IGNORE( cba.SetCommandL( CEikButtonGroupContainer::ERightSoftkeyPosition,
-                     EAknSoftkeyEmpty, KNullDesC) );
-    cba.DrawNow();                           
-    }
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotinitiateeasysetupdlg.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtInitiateEasySetupDlg.
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-// INCLUDE FILES
-//system includes
-#include <uikon/eiksrvui.h>
-#include <StringLoader.h>
-#include <wifiprotplugin.rsg>
-
-//user includes
-#include "wifiprotinitiateeasysetupdlg.h"
-#include "wifiprotdlgsplugin.h"
-#include "wifiprotplugin.hrh"
-#include "wifiprotlogger.h"
-
-// ========================= MEMBER FUNCTIONS ===============================
-//
-// --------------------------------------------------------------------------
-// CWiFiProtInitiateEasySetupDlg::CWiFiProtInitiateEasySetupDlg
-// --------------------------------------------------------------------------
-//
-CWiFiProtInitiateEasySetupDlg::CWiFiProtInitiateEasySetupDlg(
-                                                   TRequestStatus& aStatus ):
-                                     iButtonGroupPreviouslyChanged( EFalse ),
-                                     iRequestStatus( aStatus )
-    {
-    CLOG_ENTERFN(
-     "CWiFiProtInitiateEasySetupDlg::CWiFiProtInitiateEasySetupDlg" );
-    
-    iRequestStatus = KRequestPending;
-    
-    CLOG_LEAVEFN(
-     "CWiFiProtInitiateEasySetupDlg::CWiFiProtInitiateEasySetupDlg" );
-    
-    }
-    
-    
-// --------------------------------------------------------------------------
-// CWiFiProtInitiateEasySetupDlg::~CWiFiProtInitiateEasySetupDlg
-// --------------------------------------------------------------------------
-//
-CWiFiProtInitiateEasySetupDlg::~CWiFiProtInitiateEasySetupDlg()
-    {
-    CLOG_ENTERFN(
-     "CWiFiProtInitiateEasySetupDlg::~CWiFiProtInitiateEasySetupDlg" );
-  
-    STATIC_CAST( CEikServAppUi*, 
-                CCoeEnv::Static()->AppUi() )->SuppressAppSwitching( EFalse );
-    CLOG_LEAVEFN(
-     "CWiFiProtInitiateEasySetupDlg::~CWiFiProtInitiateEasySetupDlg" );
-    
-    }
-
-
-// --------------------------------------------------------------------------
-// CWiFiProtInitiateEasySetupDlg::OkToExitL
-// --------------------------------------------------------------------------
-//
-TBool CWiFiProtInitiateEasySetupDlg::OkToExitL( TInt aButtonId )
-    {
-    CLOG_ENTERFN( "CWiFiProtInitiateEasySetupDlg::OkToExitL" );
-    
-    TInt status = KErrCancel;
-    if ( aButtonId == EAknSoftkeyOk
-         || aButtonId == EAknSoftkeyYes
-         || aButtonId == EAknSoftkeyDone
-         || aButtonId == EWiFiSoftkeyContinue
-         || aButtonId == EAknSoftkeySelect )
-        {
-        status = KErrNone;
-        }
-    // if aButtonId == EAknSoftkeyView then we have to destroy the dialog
-    // afterwards, not from the callback. In this case we do not complete
-    // the client, it was completed before, just exit
-        
-    if ( !(aButtonId == EAknSoftkeyView ))    
-        {
-        // this is called when we can destroy the dialog
-        // and complete the client (activerunner) the same time
-        TRequestStatus* pS = &iRequestStatus;                
-        User::RequestComplete( pS, status ); 
-        }
-    CLOG_LEAVEFN( "CWiFiProtInitiateEasySetupDlg::OkToExitL" );
-    return ETrue;
-    }
-
-    
-// --------------------------------------------------------------------------
-// CWiFiProtInitiateEasySetupDlg::TryExitL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtInitiateEasySetupDlg::TryExitL( TInt aButtonId )
-    {
-    CLOG_ENTERFN( "CWiFiProtInitiateEasySetupDlg::TryExitL" );
-    
-    CAknMessageQueryDialog::TryExitL( aButtonId );
-
-    CLOG_LEAVEFN( "CWiFiProtInitiateEasySetupDlg::TryExitL" );
-
-    }      
-    
-// --------------------------------------------------------------------------
-// CWiFiProtInitiateEasySetupDlg::PreLayoutDynInitL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtInitiateEasySetupDlg::PreLayoutDynInitL()
-    {
-    CLOG_ENTERFN( "CWiFiProtInitiateEasySetupDlg::PreLayoutDynInitL" );
-   
-    STATIC_CAST( CEikServAppUi*, 
-                CCoeEnv::Static()->AppUi() )->SuppressAppSwitching( ETrue );
-    CAknMessageQueryDialog::PreLayoutDynInitL();
-    
-    CLOG_LEAVEFN( "CWiFiProtInitiateEasySetupDlg::PreLayoutDynInitL" );
-    
-    }
-
-// --------------------------------------------------------------------------
-// CConfirmationQuery::OfferKeyEventL()
-// --------------------------------------------------------------------------
-//
-TKeyResponse CWiFiProtInitiateEasySetupDlg::OfferKeyEventL(
-                                                 const TKeyEvent& aKeyEvent, 
-                                                 TEventCode aModifiers )
-    {
-    CLOG_ENTERFN( "CWiFiProtInitiateEasySetupDlg::OfferKeyEventL" );
-    TKeyResponse answer = EKeyWasNotConsumed;
-    TInt code = aKeyEvent.iCode;
-    switch ( code )
-        {
-        // both keys are handled the same way
-        // they mean 'movement in the list'
-        case EKeyUpArrow: 
-        case EKeyDownArrow:
-            {
-            CAknMessageQueryControl* messageQueryControl = STATIC_CAST( 
-                                    CAknMessageQueryControl*, 
-                                    Control( EAknMessageQueryContentId ) );
-            if ( messageQueryControl )
-                {
-                answer = messageQueryControl->OfferKeyEventL( 
-                                                    aKeyEvent, aModifiers );
-                if ( answer == EKeyWasConsumed )
-                    {
-                    if ( messageQueryControl->LinkHighLighted() ) 
-                        {
-                        if ( !iButtonGroupPreviouslyChanged )
-                            {
-                            CEikButtonGroupContainer& cba = 
-                                                     ButtonGroupContainer();
-
-                            ButtonGroupContainer().AddCommandSetToStackL( 
-                                          R_SOFTKEYS_SELECT_CANCEL__SELECT );
-                            cba.UpdateCommandObserverL( 
-                              CEikButtonGroupContainer::ELeftSoftkeyPosition,
-                                                                     *this );
-
-                            cba.UpdateCommandObserverL( 
-                            CEikButtonGroupContainer::EMiddleSoftkeyPosition,
-                                                                     *this );
-
-                            cba.DrawNow();
- 
-                            iButtonGroupPreviouslyChanged = ETrue;
-                            }
-                        }
-                    else if ( iButtonGroupPreviouslyChanged )
-                        {                            
-                        CEikButtonGroupContainer& cba =
-                             ButtonGroupContainer();
-
-                        cba.RemoveCommandObserver( 
-                            CEikButtonGroupContainer::ELeftSoftkeyPosition );
-
-                        cba.RemoveCommandObserver( 
-                          CEikButtonGroupContainer::EMiddleSoftkeyPosition );
-
-                        cba.RemoveCommandFromStack( 
-                            CEikButtonGroupContainer::ELeftSoftkeyPosition,
-                            EAknSoftkeyView );
-
-                        cba.RemoveCommandFromStack( 
-                            CEikButtonGroupContainer::EMiddleSoftkeyPosition, 
-                            EAknSoftkeyView );
-
-                        cba.RemoveCommandFromStack( 
-                            CEikButtonGroupContainer::ERightSoftkeyPosition, 
-                            EAknSoftkeyNo );
-
-                        cba.DrawNow();
-
-                        iButtonGroupPreviouslyChanged = EFalse;
-                        }
-                    }
-                }
-            break;      
-            }
-
-        default:
-            {
-            answer = CAknMessageQueryDialog::OfferKeyEventL( aKeyEvent,
-                                                             aModifiers );
-            break; 
-            }
-        }
-        
-    CLOG_LEAVEFN( "CWiFiProtInitiateEasySetupDlg::OfferKeyEventL" );
-        
-    return answer;
-    }
-  
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotplugin.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of base plugin.
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-// INCLUDE FILES
-
-#include "wifiprotplugin.h"
-#include "wifiprotdlgsplugin.h"
-
-
-// CONSTANTS
-
-LOCAL_D const TInt KPluginGranularity = 4;
-
-// FORWARD DECLARATIONS
-
-LOCAL_C void CreateNotifiersL( 
-                           CArrayPtrFlat<MEikSrvNotifierBase2>* aNotifiers );
-
-// --------------------------------------------------------------------------
-// NotifierArray()
-// Lib main entry point
-// --------------------------------------------------------------------------
-//
-EXPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
-    {
-    
-    CArrayPtrFlat<MEikSrvNotifierBase2>* array = NULL;
-    TRAPD(err, array = new (ELeave) 
-                   CArrayPtrFlat<MEikSrvNotifierBase2>( KPluginGranularity ));
-    if (err || array == NULL)
-        {
-        return array;
-        }
-    TRAPD( err1, CreateNotifiersL( array ) );
-    if( err1 )
-        {
-        TInt count = array->Count();
-        while( count-- )
-            {
-            (*array)[count]->Release();
-            }
-        delete array;
-        array = NULL;
-        }
-
-    return( array );
-    }
-
-// --------------------------------------------------------------------------
-// CreateNotifiersL()
-// --------------------------------------------------------------------------
-//
-LOCAL_C void CreateNotifiersL( 
-                            CArrayPtrFlat<MEikSrvNotifierBase2>* aNotifiers )
-    {
-    MEikSrvNotifierBase2 *serNotify;
-    TBool resourceFileResponsible = ETrue;
-
-    serNotify = CWiFiProtDlgsPlugin::NewL( resourceFileResponsible );
-    CleanupStack::PushL( serNotify );
-    aNotifiers->AppendL( serNotify );
-    CleanupStack::Pop( serNotify );
-    }
-    
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotpluginstub.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub implementation of wifiprotplugin for 
-*              non-WLAN products to support linking.
-*
-*/
-
-/*
-* %version: 1 %
-*/
-
-// INCLUDE FILES
-
-#include <cmmanagerext.h>
-#include <wifiprotreturn.h>
-#include <wifiprotuiinprocess.h>
-
-#include "wifiprotplugin.h"
-#include "wifiprotdlgsplugin.h"
-#include "wifiprotactiverunner.h"
-
-using namespace WiFiProt;
-
-
-// ===================== STUB FOR wifiprotplugin.cpp ========================
-    
-// --------------------------------------------------------------------------
-// NotifierArray()
-// Lib main entry point
-// --------------------------------------------------------------------------
-//
-EXPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
-    {
-    return NULL;
-    }
-
-
-
-// =================== STUB FOR wifiprotuiinprocess.cpp =====================
-
-// --------------------------------------------------------------------------
-// CWifiProtUiInProcess* CWifiProtUiInProcess::NewL()
-// --------------------------------------------------------------------------
-//
-EXPORT_C CWifiProtUiInProcess* CWifiProtUiInProcess::NewL( RCmManagerExt*
-                                                              aCmManagerExt )
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-
-
-// --------------------------------------------------------------------------
-// CWifiProtUiInProcess::~CWifiProtUiInProcess
-// --------------------------------------------------------------------------
-//
-CWifiProtUiInProcess::~CWifiProtUiInProcess( )
-
-    {    
-    }
-        
-// --------------------------------------------------------------------------
-// WiFiProt::TWiFiReturn CWifiProtUiInProcess::StartFromUiL
-// --------------------------------------------------------------------------
-//
-EXPORT_C WiFiProt::TWiFiReturn CWifiProtUiInProcess::StartFromUiL(
-                                             const TWlanSsid& aSSid,
-                                             TBool aConnectionNeeded,
-                                             RArray<TUint32>& aUidsReturned )
-   {
-    return EWiFiCancel;
-    }
-
-
-// =================== STUB FOR wifiprotdlgsplugin.cpp ======================
-
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin* CWiFiProtDlgsPlugin::NewL()
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin* CWiFiProtDlgsPlugin::NewL( 
-                             const TBool aResourceFileResponsible,
-                                      RCmManagerExt* aCmManagerExt )
-
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-
-CWiFiProtDlgsPlugin* CWiFiProtDlgsPlugin::NewL( 
-                                       const TBool aResourceFileResponsible )
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin::~CWiFiProtDlgsPlugin
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin::~CWiFiProtDlgsPlugin( )
-
-    { 
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin::TNotifierInfo 
-//                                  CWiFiProtDlgsPlugin::Info() const
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin::TNotifierInfo CWiFiProtDlgsPlugin::Info() const
-    {
-    return iInfo;
-    }
-
-// --------------------------------------------------------------------------
-// TPtrC8 CWiFiProtDlgsPlugin::StartL()
-// --------------------------------------------------------------------------
-//
-TPtrC8 CWiFiProtDlgsPlugin::StartL( const TDesC8& /*aBuffer*/ )
-    {
-    return NULL;
-    }
-
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::Cancel()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::Cancel()
-    {
-    }
-    
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::Release()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::Release()
-    {
-    }
-
-// --------------------------------------------------------------------------
-// TPtrC8 CWiFiProtDlgsPlugin::UpdateL()
-// --------------------------------------------------------------------------
-//
-TPtrC8 CWiFiProtDlgsPlugin::UpdateL(const TDesC8& /*aBuffer*/)
-    {
-    return NULL;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtDlgsPlugin::TNotifierInfo CWiFiProtDlgsPlugin::RegisterL()
-// --------------------------------------------------------------------------
-//
-CWiFiProtDlgsPlugin::TNotifierInfo CWiFiProtDlgsPlugin::RegisterL()
-    {
-    return iInfo;
-    }
-
-// --------------------------------------------------------------------------
-// void CWiFiProtDlgsPlugin::StartL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtDlgsPlugin::StartL( const TDesC8& aBuffer, 
-                                  TInt aReplySlot,
-                                  const RMessagePtr2& aMessage )
-    {
-    }
-
-
-
-// =================== STUB FOR wifiprotactiverunner.cpp ======================
-
-CWiFiProtActiveRunner* CWiFiProtActiveRunner::NewL(
-        CWiFiProtDlgsPlugin* aParent, TInt aPriority )
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::~CWiFiProtActiveRunner
-// --------------------------------------------------------------------------
-//
-CWiFiProtActiveRunner::~CWiFiProtActiveRunner()
-    {
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::DoCancel
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::DoCancel()
-    { 
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::RunL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::RunL()
-    {
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::PinQueryExitL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::PinQueryExitL( TInt aResponse )
-    {
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveRunner::DialogDismissedL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveRunner::DialogDismissedL( TInt aButtonId )
-    {
-    }
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotselectnetworkdlg.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtSelectNetworkDlg.
-*
-*/
-
-/*
-* %version: tr1cfwln#9 %
-*/
-
-// INCLUDE FILES
-//system includes
-#include <uikon/eiksrvui.h>
-#include <StringLoader.h>
-#include <wifiprotplugin.rsg>
-#include <badesca.h>
-
-//user includes
-#include "wifiprotselectnetworkdlg.h"
-#include "wifiprotdlgsplugin.h"
-#include "wifiprotplugin.hrh"
-// ========================== MEMBER FUNCTIONS ==============================
-//
-// --------------------------------------------------------------------------
-// CWiFiProtSelectNetworkDlg::CWiFiProtSelectNetworkDlg
-// --------------------------------------------------------------------------
-//
-CWiFiProtSelectNetworkDlg::CWiFiProtSelectNetworkDlg(
-                                        TRequestStatus& aStatus ,
-                                        TInt& aSelected ,
-                                        CDesCArrayFlat* aItems,
-                                        CArrayPtr<CGulIcon>* aIcons ):
-                                           CAknListQueryDialog( &aSelected ),
-                                           iRequestStatus( aStatus ),
-                                           iSelected( aSelected ),
-                                           iIcons( aIcons ),
-                                           iItems( aItems )
-    {
-    iRequestStatus = KRequestPending;
-    }
-    
-    
-// --------------------------------------------------------------------------
-// CWiFiProtSelectNetworkDlg::~CWiFiProtSelectNetworkDlg
-// --------------------------------------------------------------------------
-//
-CWiFiProtSelectNetworkDlg::~CWiFiProtSelectNetworkDlg()
-    {
-  
-    STATIC_CAST( CEikServAppUi*, 
-                CCoeEnv::Static()->AppUi() )->SuppressAppSwitching( EFalse );
-    delete iIcons;
-    delete iItems;
-    }
-
-// --------------------------------------------------------------------------
-// void CSelectDestinationDlg::PrepareAndRunLD
-// --------------------------------------------------------------------------
-//
-void CWiFiProtSelectNetworkDlg::PrepareAndRunLD()
-    {
-    PrepareLC(R_CONN_LIST_QUERY);
-    // Set the description field on the query
-    HBufC* desc = StringLoader::LoadLC(
-                 R_QTN_NETW_CONSET_WPS_DETAIL_SELECT_NETWORK );
-    //ownership transferred                 
-    SetItemTextArray( iItems ); 
-    iItems = NULL;
-    //ownership transferred
-    SetIconArrayL( iIcons );
-    iIcons = NULL;
-
-    MessageBox()->SetMessageTextL( desc );
-    CleanupStack::PopAndDestroy( desc );                
-    RunLD();
-    }
-
-
-// --------------------------------------------------------------------------
-// CWiFiProtSelectNetworkDlg::OkToExitL
-// --------------------------------------------------------------------------
-//
-TBool CWiFiProtSelectNetworkDlg::OkToExitL( TInt aButtonId )
-    {
-    TInt status = KErrCancel;
-    if ( aButtonId == EAknSoftkeyOk
-      || aButtonId == EAknSoftkeyYes
-      || aButtonId == EAknSoftkeyDone
-      || aButtonId == EAknSoftkeySelect )
-        {
-        // This should be done automatically
-        // I have no idea why iSelected isn't updated
-        iSelected = ListBox()->CurrentItemIndex();
-        status = KErrNone;
-        }
-    TRequestStatus* pS = &iRequestStatus;                
-    User::RequestComplete( pS, status ); 
-
-    return ETrue;
-    }
-        
-// --------------------------------------------------------------------------
-// CWiFiProtSelectNetworkDlg::PreLayoutDynInitL()
-// --------------------------------------------------------------------------
-//
-void CWiFiProtSelectNetworkDlg::PreLayoutDynInitL()
-    {
-    CAknListQueryDialog::PreLayoutDynInitL();
-    STATIC_CAST( CEikServAppUi*, 
-                CCoeEnv::Static()->AppUi() )->SuppressAppSwitching( ETrue );
-                
-    }
-    
-// --------------------------------------------------------------------------
-// void CSelectDestinationDlg::HandleResourceChange
-// --------------------------------------------------------------------------
-//
-void CWiFiProtSelectNetworkDlg::HandleResourceChange( TInt aType )
-    {
-    if ( aType == KAknsMessageSkinChange )
-        {
-        CAknListQueryDialog::HandleResourceChange( aType );
-
-        TRAP_IGNORE( SetIconArrayL( iIcons ) );
-
-        SizeChanged();
-        }
-    else
-        {
-        if ( aType == KEikDynamicLayoutVariantSwitch )
-            {
-            TRect mainPaneRect;
-            AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane,
-                                               mainPaneRect );
-
-            TAknLayoutRect layoutRect;
-            layoutRect.LayoutRect( TRect( TPoint( 0, 0 ), 
-                                   mainPaneRect.Size() ),
-                                   AKN_LAYOUT_WINDOW_list_gen_pane( 0 ) );
-
-            ListBox()->SetRect( layoutRect.Rect() );
-            }
-
-        // Base call
-        CAknListQueryDialog::HandleResourceChange( aType );
-        }
-    }    
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/pluginsrc/wifiprotuiinprocess.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of CWifiProtUiInProcess.
-*
-*/
-
-/*
-* %version: tr1cfwln#7 %
-*/
-
-// INCLUDE FILES
-
-#include <cmmanagerext.h>
-#include <wifiprotreturn.h>
-#include <wifiprotuiinprocess.h>
-
-#include "wifiprotdlgsplugin.h"
-#include "wifiprotlogger.h"
-
-using namespace WiFiProt;
-
-// =========================== MEMBER FUNCTIONS =============================
-
-// --------------------------------------------------------------------------
-// CWifiProtUiInProcess* CWifiProtUiInProcess::NewL()
-// --------------------------------------------------------------------------
-//
-EXPORT_C CWifiProtUiInProcess* CWifiProtUiInProcess::NewL( RCmManagerExt*
-                                                              aCmManagerExt )
-    {
-    CLOG_ENTERFN( "WiFiProtDlgsPlugin::NewL" );
-    
-    CWifiProtUiInProcess* self = new ( ELeave ) CWifiProtUiInProcess();
-    CleanupStack::PushL( self );
-    self->ConstructL( aCmManagerExt );
-    CleanupStack::Pop();
-    CLOG_LEAVEFN( "WiFiProtDlgsPlugin::NewL" );
-    return self;
-    }
-
-
-// --------------------------------------------------------------------------
-// CWifiProtUiInProcess::~CWifiProtUiInProcess
-// --------------------------------------------------------------------------
-//
-CWifiProtUiInProcess::~CWifiProtUiInProcess( )
-
-    {    
-    CLOG_ENTERFN( "WiFiProtDlgsPlugin::~CWifiProtUiInProcess" );
-    delete iWiFiProtDlgsPlugin; 
-    CLOG_LEAVEFN( "WiFiProtDlgsPlugin::~CWifiProtUiInProcess" );
-    }
-        
-// --------------------------------------------------------------------------
-// WiFiProt::TWiFiReturn CWifiProtUiInProcess::StartFromUiL
-// --------------------------------------------------------------------------
-//
-EXPORT_C WiFiProt::TWiFiReturn CWifiProtUiInProcess::StartFromUiL(
-                                             const TWlanSsid& aSSid,
-                                             TBool aConnectionNeeded,
-                                             RArray<TUint32>& aUidsReturned )
-   {
-    CLOG_ENTERFN( "WiFiProtDlgsPlugin::StartFromUiL" );
-    
-    WiFiProt::TWiFiReturn ret =
-         iWiFiProtDlgsPlugin->StartFromUiL( aSSid,
-                                            aConnectionNeeded,
-                                            aUidsReturned );
-    
-    CLOG_LEAVEFN( "WiFiProtDlgsPlugin::StartFromUiL" );
-    
-    return ret;
-    }
-    
-    
-// --------------------------------------------------------------------------
-// CWifiProtUiInProcess::CWifiProtUiInProcess
-// --------------------------------------------------------------------------
-//
-CWifiProtUiInProcess::CWifiProtUiInProcess( ):
-                                iWiFiProtDlgsPlugin(NULL)
-    {    
-    CLOG_ENTERFN( "WiFiProtDlgsPlugin::CWifiProtUiInProcess" );
-    CLOG_LEAVEFN( "WiFiProtDlgsPlugin::CWifiProtUiInProcess" );
-    }
-
-// --------------------------------------------------------------------------
-// void CWifiProtUiInProcess::ConstructL( )
-// --------------------------------------------------------------------------
-//
-void CWifiProtUiInProcess::ConstructL( RCmManagerExt* aCmManagerExt )
-    {
-    CLOG_ENTERFN( "WiFiProtDlgsPlugin::ConstructL" );
-    
-    iWiFiProtDlgsPlugin = CWiFiProtDlgsPlugin::NewL( ETrue, aCmManagerExt );
-    
-    CLOG_LEAVEFN( "WiFiProtDlgsPlugin::ConstructL" );
-    
-    }    
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/rom/WiFiProt.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for WifiProtectedSetup
-*
-*/
-
-/*
-* %version: tr1cfwln#9 %
-*/
-
-#ifndef __WIFIPROT_IBY__
-#define __WIFIPROT_IBY__
-
-#ifdef __PROTOCOL_WLAN
-
-REM Wi-Fi Protected Setup
-
-file=ABI_DIR\BUILD_DIR\WIFIPROTCLIENT.DLL		SHARED_LIB_DIR\WIFIPROTCLIENT.DLL
-file=ABI_DIR\BUILD_DIR\WIFIPROTPLUGIN.DLL		SHARED_LIB_DIR\WIFIPROTPLUGIN.DLL
-#else
-//stub for non-WLAN products
-file=ABI_DIR\BUILD_DIR\wifiprotclientstub.dll		SHARED_LIB_DIR\WIFIPROTCLIENT.DLL
-file=ABI_DIR\BUILD_DIR\wifiprotpluginstub.dll		SHARED_LIB_DIR\WIFIPROTPLUGIN.DLL
-
-#endif // __PROTOCOL_WLAN
-
-#endif
--- a/wlansecuritysettings/wifiprotectedsetup/rom/WiFiProtResources.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for WifiProtectedSetup
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef __WIFIPROTRESOURCES_IBY__
-#define __WIFIPROTRESOURCES_IBY__
-
-#ifdef __PROTOCOL_WLAN
-
-data=DATAZ_\RESOURCE_FILES_DIR\WiFiProtPlugin.rsc	RESOURCE_FILES_DIR\WiFiProtPlugin.rsc
-
-#endif // __PROTOCOL_WLAN
-
-#endif
\ No newline at end of file
--- a/wlansecuritysettings/wifiprotectedsetup/src/wifiprotactiveresp.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of CWiFiProtActiveResp class
-*
-*/
-
-/*
-* %version: tr1cfwln#9 %
-*/
-
-// INCLUDE FILES
-#include "wifiprotactiveresp.h"
-#include "wifiprotlogger.h"
-
-//CONSTS
-_LIT( KActiveRespPanic , "WPS Active Resp");
-// ================= MEMBER FUNCTIONS =======================
-
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::NewL
-// --------------------------------------------------------------------------
-//
-CWiFiProtActiveResp* CWiFiProtActiveResp::NewL(  const TWlanSsid& aSSid,
-                                         TBool aConnectionNeeded,
-                                         RArray<TUint32>& aUidsReturned,
-                                         WiFiProt::TWiFiReturn&
-                                         aReturnValue )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveResp::NewL" );
-    CWiFiProtActiveResp* self =
-     new( ELeave )CWiFiProtActiveResp( aSSid , aConnectionNeeded,
-                                       aUidsReturned,
-                                       aReturnValue );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    CLOG_LEAVEFN( "CWiFiProtActiveResp::NewL" );
-    return self;
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::NewL
-// --------------------------------------------------------------------------
-//
-CWiFiProtActiveResp* CWiFiProtActiveResp::NewL(  const TWlanSsid& aSSid,
-                                     TWlanProtectedSetupCredentialAttribute&
-                                                            aNetworkSettings,
-                                         WiFiProt::TWiFiReturn&
-                                         aReturnValue )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveResp::NewL" );
-    CWiFiProtActiveResp* self =
-     new( ELeave )CWiFiProtActiveResp( aSSid , 
-                                       aNetworkSettings,
-                                       aReturnValue );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    CLOG_LEAVEFN( "CWiFiProtActiveResp::NewL" );
-    return self;
-    }
-    
-// ----------------------------------------------------
-// CWiFiProtActiveResp::~CWiFiProtActiveResp()
-// ----------------------------------------------------
-//
-CWiFiProtActiveResp::~CWiFiProtActiveResp()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveResp::~CWiFiProtActiveResp" );
-    Cancel();
-    CLOG_LEAVEFN( "CWiFiProtActiveResp::~CWiFiProtActiveResp" );
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::RunL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveResp::RunL()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveResp::RunL");
-
-    if ( iWiFiInputParams().iConnectionNeeded )
-        {
-        *iNetworkSettings = iWiFiConnOutputParams().iNetworkSettings;
-        iReturnValue = iWiFiConnOutputParams().iReturn;
-        }
-    else
-        {
-        if ( iStatus.Int() == KErrNone )
-            {            
-            //CM creation mode (WPS phase 1), return iap id array    
-            const TInt elementSize = sizeof( TUint32 );
-            const TInt elementCount = iWiFiOutputParams().iIapIds.Length()
-                                                            / elementSize;
-            const TUint8* ptr = iWiFiOutputParams().iIapIds.Ptr();
-            
-            for ( TInt i = 0; i < elementCount; i++)
-                {
-                iIapIds->Append( *( (TUint32*) &( ptr[elementSize*i] ) ) );
-                }
-            }
-        iReturnValue = iWiFiOutputParams().iReturn;
-        }
-
-    TRequestStatus* pS = iRequestStatus;
-    User::RequestComplete( pS, iStatus.Int() );
-
-    CLOG_LEAVEFN( "CWiFiProtActiveResp::RunL");
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::DoCancel
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveResp::DoCancel()
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveResp:DoCancel");
-    TRequestStatus* pS = iRequestStatus;
-    User::RequestComplete( pS, KErrCancel );
-    CLOG_LEAVEFN( "CWiFiProtActiveResp::DoCancel");
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::Observe
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveResp::Observe( TRequestStatus &aStatus )
-    {
-    CLOG_ENTERFN( "CWiFiProtActiveResp::Observe");
-    CActiveScheduler::Add( this );
-
-    iRequestStatus = &aStatus;
-    *iRequestStatus = KRequestPending;
-
-    SetActive();
-    CLOG_LEAVEFN( "CWiFiProtActiveResp::Observe");
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::InputBuffer
-// --------------------------------------------------------------------------
-//
-TPckgBuf<WiFiProt::TWiFiInputParams>* CWiFiProtActiveResp::InputBuffer() 
-    { 
-    return &iWiFiInputParams; 
-    }
-        
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::OutputBuffer
-// --------------------------------------------------------------------------
-//
-TPckgBuf<WiFiProt::TWiFiOutputParams>* CWiFiProtActiveResp::OutputBuffer() 
-    {
-    if ( iWiFiInputParams().iConnectionNeeded )
-        {
-        // Should use ConnOutputBuffer() if configuring a connection!
-        User::Panic( KActiveRespPanic , KErrNotSupported);
-        }
-    return &iWiFiOutputParams; 
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::ConnOutputBuffer
-// --------------------------------------------------------------------------
-//
-TPckgBuf<WiFiProt::TWiFiConnOutputParams>* CWiFiProtActiveResp::ConnOutputBuffer() 
-    { 
-    if ( !(iWiFiInputParams().iConnectionNeeded) )
-        {
-        // Should use OutputBuffer() if not configuring a connection!
-        User::Panic( KActiveRespPanic , KErrNotSupported);
-        }
-    return &iWiFiConnOutputParams; 
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::CWiFiProtActiveResp
-// --------------------------------------------------------------------------
-//
-CWiFiProtActiveResp::CWiFiProtActiveResp(
-                     const TWlanSsid& aSSid, TBool aConnectionNeeded,
-                     RArray<TUint32>& aUidsReturned,
-                     WiFiProt::TWiFiReturn& aReturnValue )
-                     : CActive( CActive::EPriorityUserInput ),
-                     iIapIds( &aUidsReturned ),
-                     iReturnValue( aReturnValue ),
-                     iWiFiOutputParams( KNullDesC8() ),
-                     iWiFiInputParams( TPckgBuf<WiFiProt::TWiFiInputParams>
-                     ( WiFiProt::TWiFiInputParams( aSSid, 
-                                                   aConnectionNeeded ) ) ),
-              iWiFiConnOutputParams(TPckgBuf<WiFiProt::TWiFiConnOutputParams>
-                     ( WiFiProt::TWiFiConnOutputParams(
-                      TWlanProtectedSetupCredentialAttribute() ) )  )
-    {
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::CWiFiProtActiveResp
-// --------------------------------------------------------------------------
-//
-CWiFiProtActiveResp::CWiFiProtActiveResp(
-                     const TWlanSsid& aSSid,
-                     TWlanProtectedSetupCredentialAttribute&
-                                              aNetworkSettings,
-                     WiFiProt::TWiFiReturn& aReturnValue )
-                     : CActive( CActive::EPriorityUserInput ),
-                     iIapIds( NULL ),
-                     iReturnValue( aReturnValue ),
-                     iWiFiOutputParams( KNullDesC8() ),
-                     iWiFiInputParams( TPckgBuf<WiFiProt::TWiFiInputParams>
-                     ( WiFiProt::TWiFiInputParams( aSSid, 
-                                                   ETrue ) ) ),
-              iWiFiConnOutputParams(TPckgBuf<WiFiProt::TWiFiConnOutputParams>
-                     ( WiFiProt::TWiFiConnOutputParams(
-                      TWlanProtectedSetupCredentialAttribute() ) ) ),
-                     iNetworkSettings( &aNetworkSettings )
-                                                   
-    {
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtActiveResp::ConstructL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtActiveResp::ConstructL()
-    {
-    }
-    
-// End of File  
--- a/wlansecuritysettings/wifiprotectedsetup/src/wifiprotsession.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of RWiFiProtSession
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-// INCLUDE FILES
-#include "wifiprotsession.h"
-#include "e32ver.h"
-#include <wifiprotuiddefs.h>
-#include "wifiprotlogger.h"
-
-using namespace WiFiProt;
-
-// --------------------------------------------------------------------------
-// RWiFiProtSession::RWiFiProtSession()
-// --------------------------------------------------------------------------
-//
-RWiFiProtSession::RWiFiProtSession() :
-                        RSessionBase(),
-                        iNotifier( NULL ),
-                        iWiFiProtActiveResp( NULL )
-    {
-    CLOG_ENTERFN( "RWiFiProtSession::RWiFiProtSession" );
-    CLOG_LEAVEFN( "RWiFiProtSession::RWiFiProtSession" );
-    }
-
-
-// --------------------------------------------------------------------------
-// ~RWiFiProtSession
-// --------------------------------------------------------------------------
-//
-RWiFiProtSession::~RWiFiProtSession()
-    {
-    CLOG_ENTERFN( "RWiFiProtSession::~RWiFiProtSession" );
-    Close();
-    CLOG_LEAVEFN( "RWiFiProtSession::~RWiFiProtSession" );
-    }
-
-
-// --------------------------------------------------------------------------
-// Connect
-//
-// Create a session to the extended notifier framework
-// --------------------------------------------------------------------------
-//
-TInt RWiFiProtSession::Connect()
-    {
-    CLOG_ENTERFN( "RWiFiProtSession::Connect" );
-
-    TInt error( KErrNone );
-    if ( !iNotifier )
-        {
-        TRAP( error, iNotifier = new (ELeave) RNotifier() );
-        }
-    if ( !error && iNotifier )
-        {
-        error = iNotifier->Connect();
-        }
-    CLOG_LEAVEFN( "RWiFiProtSession::Connect" ); 
-    return error;
-    }
-    
-// --------------------------------------------------------------------------
-// Close
-// --------------------------------------------------------------------------
-//
-void RWiFiProtSession::Close()
-    {
-    CLOG_ENTERFN( "RWiFiProtSession::Close" );
-
-    RSessionBase::Close();
-    
-    if (iWiFiProtActiveResp)
-        {
-        iWiFiProtActiveResp->Cancel();
-        delete iWiFiProtActiveResp;  
-        iWiFiProtActiveResp = NULL;
-        }
-    if ( iNotifier ) 
-        {
-        iNotifier->Close();
-        delete iNotifier;    
-        iNotifier = NULL;
-        }
-
-    CLOG_LEAVEFN( "RWiFiProtSession::Close" );
-    }
-    
-// --------------------------------------------------------------------------
-// StartWiFiProtL
-// --------------------------------------------------------------------------
-//
-void RWiFiProtSession::StartWiFiProtL( const TWlanSsid& aSSid,
-                                       TBool aConnectionNeeded,
-                                       RArray<TUint32>& aUidsReturned,
-                                       WiFiProt::TWiFiReturn& aReturnValue,
-                                       TRequestStatus& aStatus )
-    {
-    CLOG_ENTERFN( "RWiFiProtSession::StartWiFiProtL" );
-
-    aConnectionNeeded = EFalse; // this parameter is not supported anymore
-                                // to be set from the API, but it is used
-                                // internally from StartWiFiProtConnL
-    TRAPD( err, iWiFiProtActiveResp =
-     CWiFiProtActiveResp::NewL( aSSid,
-                                aConnectionNeeded,
-                                aUidsReturned,
-                                aReturnValue ) );
-
-    
-    if ( err != KErrNone )
-        {
-        TRequestStatus* pS = &aStatus;
-        User::RequestComplete( pS, err );
-        }
-    else
-        {
-        iWiFiProtActiveResp->Observe( aStatus );
-
-        TPckgBuf<TWiFiOutputParams>* outputParams =
-             iWiFiProtActiveResp->OutputBuffer();
-        TPckgBuf<TWiFiInputParams>* inputParams = 
-             iWiFiProtActiveResp->InputBuffer();
-
-        if ( iNotifier )
-            {
-            TRequestStatus& status = iWiFiProtActiveResp->iStatus;
-            iNotifier->StartNotifierAndGetResponse( status,
-                                                    KUidWiFiProtSetup,
-                                                    *inputParams,
-                                                    *outputParams );
-            }
-        }
-
-    CLOG_LEAVEFN( "RWiFiProtSession::StartWiFiProtL" );
-    }
-
-// --------------------------------------------------------------------------
-// StartWiFiProtConnL
-// --------------------------------------------------------------------------
-//
-void RWiFiProtSession::StartWiFiProtConnL( const TWlanSsid& aSSid,
-                                      TWlanProtectedSetupCredentialAttribute&
-                                        aNetworkSettings,
-                                      WiFiProt::TWiFiReturn& aReturnValue,
-                                      TRequestStatus& aStatus )
-    {
-    CLOG_ENTERFN( "RWiFiProtSession::StartWiFiProtConnL" );
-
-    TRAPD( err, iWiFiProtActiveResp =
-     CWiFiProtActiveResp::NewL( aSSid,
-                                aNetworkSettings,
-                                aReturnValue ) );
-
-    
-    if ( err != KErrNone )
-        {
-        TRequestStatus* pS = &aStatus;
-        User::RequestComplete( pS, err );
-        }
-    else
-        {
-        iWiFiProtActiveResp->Observe( aStatus );
-
-        TPckgBuf<TWiFiConnOutputParams>* connoutputParams =
-             iWiFiProtActiveResp->ConnOutputBuffer();
-        TPckgBuf<TWiFiInputParams>* inputParams = 
-             iWiFiProtActiveResp->InputBuffer();
-
-        if ( iNotifier )
-            {
-            TRequestStatus& status = iWiFiProtActiveResp->iStatus;
-            iNotifier->StartNotifierAndGetResponse( status,
-                                                    KUidWiFiProtSetup,
-                                                    *inputParams,
-                                                    *connoutputParams );
-            }
-        }
-
-    CLOG_LEAVEFN( "RWiFiProtSession::StartWiFiProtConnL" );
-    }    
-    
-// --------------------------------------------------------------------------
-// CancelWiFiProt
-// --------------------------------------------------------------------------
-//
-void RWiFiProtSession::CancelWiFiProt()
-    {
-    CLOG_ENTERFN( "RWiFiProtSession::CancelWiFiProt()" );
-    iNotifier->CancelNotifier( KUidWiFiProtSetup );
-    iWiFiProtActiveResp->Cancel();
-    delete iWiFiProtActiveResp ; 
-    iWiFiProtActiveResp = NULL; 
-    CLOG_LEAVEFN( "RWiFiProtSession::CancelWiFiProt()" );
-    }    
-
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/src/wifiprotsyncclient.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtSyncClient.
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-// INCLUDE FILES
-#include "wifiprotsyncclient.h"
-#include "wifiprotlogger.h"
-
-//
-// WiFiProtSyncClient definitions
-//
-// --------------------------------------------------------------------------
-// NewL
-// --------------------------------------------------------------------------
-//
-CWiFiProtSyncClient* CWiFiProtSyncClient::NewL( RWiFiProtSession& aClient,
-                    TInt aPriority )
-    {
-    CWiFiProtSyncClient* self = new(ELeave) CWiFiProtSyncClient( aClient,
-                                                                aPriority );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); // self
-    return self;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtSyncClient
-// --------------------------------------------------------------------------
-//
-CWiFiProtSyncClient::CWiFiProtSyncClient( RWiFiProtSession& aClient,
-                                          TInt aPriority ) 
-                                         : CActive( aPriority ),
-                                           iClient( aClient )
-    {
-    }
-
-// --------------------------------------------------------------------------
-// ConstructL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtSyncClient::ConstructL()
-    {
-    CActiveScheduler::Add( this );
-    iState = ENoState;
-    }
-
-// --------------------------------------------------------------------------
-// ~CWiFiProtSyncClient
-// --------------------------------------------------------------------------
-//
-CWiFiProtSyncClient::~CWiFiProtSyncClient()
-    {
-    Cancel();
-    }
-
-// --------------------------------------------------------------------------
-// StartWiFiProtL
-// --------------------------------------------------------------------------
-//
-WiFiProt::TWiFiReturn
-    CWiFiProtSyncClient::StartWiFiProtL( const TWlanSsid& aSSid, 
-                                         TBool aConnectionNeeded,
-                                         RArray<TUint32>& aUidsReturned )
-    {
-    WiFiProt::TWiFiReturn ret;
-    iClient.StartWiFiProtL( aSSid, aConnectionNeeded, aUidsReturned, ret,
-                            iStatus );
-    SetActive( ERunWiFiProt );
-    iWait.Start(); //wait for request to complete
-    return ret;
-    }
-
-
-    
-// --------------------------------------------------------------------------
-// SetActive
-// --------------------------------------------------------------------------
-//
-void CWiFiProtSyncClient::SetActive( TWiFiState aState )
-    {
-    iState = aState;
-    CActive::SetActive();
-    }
-
-// --------------------------------------------------------------------------
-// RunL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtSyncClient::RunL()
-    {
-    const TWiFiState state = iState;
-    iState = ENoState;
-
-    switch (state)
-        {
-        case ERunWiFiProt:
-            {
-            iWait.AsyncStop();
-            break;
-            }
-        default:
-            {
-            User::Leave(KErrGeneral);
-            break;
-            }
-        }
-    }
-
-// --------------------------------------------------------------------------
-// DoCancel
-// --------------------------------------------------------------------------
-//
-void CWiFiProtSyncClient::DoCancel()
-    { 
-    switch (iState)
-        {
-        case ERunWiFiProt:
-            {
-            CLOG_WRITE( "CWiFiProtSyncClient::DoCancel()" );
-            iClient.CancelWiFiProt();
-            break;
-            }
-        default:
-            {
-            break;
-            }
-        }
-    iState = ENoState;
-    }
-// End of File  
--- a/wlansecuritysettings/wifiprotectedsetup/src/wifiprotuiclient.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtUiClient.  
-*
-*/
-
-/*
-* %version: tr1cfwln#9 %
-*/
-
-// INCLUDE FILES
-
-#include <wifiprotuiclient.h>
-
-#include "wifiprotuiclientimpl.h"
-#include "wifiprotlogger.h"
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CWiFiProtUiClient* CWiFiProtUiClient::NewL()
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClient::NewL" );
-    CWiFiProtUiClient* wifi = new ( ELeave ) CWiFiProtUiClient();
-    CleanupStack::PushL( wifi );
-    wifi->iImpl = CWiFiProtUiClientImpl::NewL();
-    CleanupStack::Pop( wifi );
-    CLOG_LEAVEFN( "CWiFiProtUiClient::NewL" ); 
-    return wifi;
-    }
-
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::~CWiFiProtUiClient
-// ---------------------------------------------------------
-//
-EXPORT_C CWiFiProtUiClient::~CWiFiProtUiClient()
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClient::~CWiFiProtUiClient" );
-    delete iImpl;
-    CLOG_LEAVEFN( "CWiFiProtUiClient::~CWiFiProtUiClient" );
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::StartWiFiProtL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWiFiProtUiClient::StartWiFiProtL( const TWlanSsid& aSSid,
-                                                 TBool aConnectionNeeded,
-                                                 RArray<TUint32>& aUidsReturned,
-                                                 WiFiProt::TWiFiReturn& aReturnValue,
-                                                 TRequestStatus& aStatus )
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClient::StartWiFiProtL" );
-    iImpl->StartWiFiProtL( aSSid, aConnectionNeeded, aUidsReturned, aReturnValue, aStatus );
-    CLOG_LEAVEFN( "CWiFiProtUiClient::StartWiFiProtL" );
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::StartWiFiProtL
-// ---------------------------------------------------------
-//
-EXPORT_C WiFiProt::TWiFiReturn CWiFiProtUiClient::StartWiFiProtSyncL(
- const TWlanSsid& aSSid, TBool aConnectionNeeded,RArray<TUint32>& aUidsReturned )
-    {
-    CLOG_WRITE( "CWiFiProtUiClient::StartWiFiProtSyncL" );
-    return iImpl->StartWiFiProtSyncL( aSSid, aConnectionNeeded, aUidsReturned );
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::CancelWiFiProt
-// ---------------------------------------------------------
-//
-EXPORT_C void CWiFiProtUiClient::CancelWiFiProt()
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClient::CancelWiFiProt" );
-    iImpl->CancelWiFiProt();
-    CLOG_LEAVEFN( "CWiFiProtUiClient::CancelWiFiProt" );
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::StartWiFiProtConnL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWiFiProtUiClient::StartWiFiProtConnL( const TWlanSsid& aSSid,
-                                      TWlanProtectedSetupCredentialAttribute&
-                                        aNetworkSettings,
-                                      WiFiProt::TWiFiReturn& aReturnValue,
-                                      TRequestStatus& aStatus )
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClient::StartWiFiProtConnL" );
-    iImpl->StartWiFiProtConnL( aSSid, aNetworkSettings, aReturnValue, aStatus );
-    CLOG_LEAVEFN( "CWiFiProtUiClient::StartWiFiProtConnL" );
-    }
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/src/wifiprotuiclientimpl.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWiFiProtUiClientImpl.     
-*
-*/
-
-/*
-* %version: tr1cfwln#11 %
-*/
-
-// INCLUDE FILES
-
-#include <bautils.h>
-#include <StringLoader.h>
-#include <commdb.h>
-#include <aknnotewrappers.h>
-#include <wifiprotuiclient.h>
-#include <AknsUtils.h>
-
-#ifndef __WINS__
-#include <wlanmgmtclient.h>
-#include <WlanCdbCols.h>
-#endif  // ! __WINS__
-#include <data_caging_path_literals.hrh>
-
-#include "wifiprotuiclientimpl.h"
-#include "wifiprotlogger.h"
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// --------------------------------------------------------------------------
-// CWiFiProtUiClientImpl::NewL
-// --------------------------------------------------------------------------
-//
-CWiFiProtUiClientImpl* CWiFiProtUiClientImpl::NewL()
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClientImpl::NewL" );
-    CWiFiProtUiClientImpl* clientImpl = 
-                                new ( ELeave ) CWiFiProtUiClientImpl();
-    CleanupStack::PushL( clientImpl );
-    clientImpl->ConstructL();
-    CleanupStack::Pop( clientImpl );
-    CLOG_LEAVEFN( "CWiFiProtUiClientImpl::NewL" );
-    return clientImpl;
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtUiClientImpl::~CWiFiProtUiClientImpl
-// --------------------------------------------------------------------------
-//
-CWiFiProtUiClientImpl::~CWiFiProtUiClientImpl()
-    {  
-    CLOG_ENTERFN( "CWiFiProtUiClientImpl::~CWiFiProtUiClientImpl" );  
-    delete iWiFiProtSyncClient;
-    iNotif.Close();
-    CLOG_LEAVEFN( "CWiFiProtUiClientImpl::~CWiFiProtUiClientImpl" );
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtUiClientImpl::StartWiFiProtL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtUiClientImpl::StartWiFiProtL( const TWlanSsid& aSSid,
-                                         TBool aConnectionNeeded,
-                                         RArray<TUint32>& aUidsReturned,
-                                         WiFiProt::TWiFiReturn& aReturnValue,
-                                         TRequestStatus& aStatus )
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClientImpl::StartWiFiProtL" );
-    iNotif.StartWiFiProtL( aSSid, aConnectionNeeded,
-                           aUidsReturned, aReturnValue, aStatus );
-    CLOG_LEAVEFN( "CWiFiProtUiClientImpl::StartWiFiProtL" );        
-    }
-    
- // --------------------------------------------------------------------------
-// CWiFiProtUiClientImpl::StartWiFiProtSyncL
-// --------------------------------------------------------------------------
-//
-WiFiProt::TWiFiReturn 
-CWiFiProtUiClientImpl::StartWiFiProtSyncL( const TWlanSsid& aSSid,
-                                         TBool aConnectionNeeded,
-                                         RArray<TUint32>& aUidsReturned )
-    {
-    CLOG_WRITE( "CWiFiProtUiClientImpl::StartWiFiProtSyncL" );
-    if (iWiFiProtSyncClient == NULL)
-        {
-        iWiFiProtSyncClient = CWiFiProtSyncClient::NewL( iNotif );
-        }
-    return iWiFiProtSyncClient->StartWiFiProtL( aSSid,
-                                         aConnectionNeeded, aUidsReturned );
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClientImpl::StartWiFiProtConnL
-// ---------------------------------------------------------
-//
-void CWiFiProtUiClientImpl::StartWiFiProtConnL( const TWlanSsid& aSSid,
-                                      TWlanProtectedSetupCredentialAttribute&
-                                        aNetworkSettings,
-                                      WiFiProt::TWiFiReturn& aReturnValue,
-                                      TRequestStatus& aStatus )
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClientImpl::StartWiFiProtConnL" );
-    iNotif.StartWiFiProtConnL( aSSid, aNetworkSettings, aReturnValue, aStatus );
-    CLOG_LEAVEFN( "CWiFiProtUiClientImpl::StartWiFiProtConnL" );
-    }
-    
-// --------------------------------------------------------------------------
-// CWiFiProtUiClientImpl::CancelWiFiProt
-// --------------------------------------------------------------------------
-//
-void CWiFiProtUiClientImpl::CancelWiFiProt(  )
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClientImpl::CancelWiFiProt()" );
-    iNotif.CancelWiFiProt( );
-    CLOG_LEAVEFN( "CWiFiProtUiClientImpl::CancelWiFiProt()" );        
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtUiClientImpl::CWiFiProtUiClientImpl
-// --------------------------------------------------------------------------
-//
-CWiFiProtUiClientImpl::CWiFiProtUiClientImpl()
-    {
-    }
-
-// --------------------------------------------------------------------------
-// CWiFiProtUiClientImpl::ConstructL
-// --------------------------------------------------------------------------
-//
-void CWiFiProtUiClientImpl::ConstructL()
-    {
-    CLOG_ENTERFN( "CWiFiProtUiClientImpl::ConstructL" );
-    User::LeaveIfError( iNotif.Connect() );
-    CLOG_LEAVEFN( "CWiFiProtUiClientImpl::ConstructL" ); 
-    }    
-// End of File
--- a/wlansecuritysettings/wifiprotectedsetup/src/wifiprotuiclientstub.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub implementation of class CWiFiProtUiClient for 
-*              non-WLAN products to support linking.  
-*
-*/
-
-/*
-* %version: 1 %
-*/
-
-// INCLUDE FILES
-
-#include <wifiprotuiclient.h>
-#include "wifiprotsyncclient.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CWiFiProtUiClient* CWiFiProtUiClient::NewL()
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::~CWiFiProtUiClient
-// ---------------------------------------------------------
-//
-EXPORT_C CWiFiProtUiClient::~CWiFiProtUiClient()
-    {
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::StartWiFiProtL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWiFiProtUiClient::StartWiFiProtL( const TWlanSsid& aSSid,
-                                                 TBool aConnectionNeeded,
-                                                 RArray<TUint32>& aUidsReturned,
-                                                 WiFiProt::TWiFiReturn& aReturnValue,
-                                                 TRequestStatus& aStatus )
-    {
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::StartWiFiProtL
-// ---------------------------------------------------------
-//
-EXPORT_C WiFiProt::TWiFiReturn CWiFiProtUiClient::StartWiFiProtSyncL(
- const TWlanSsid& aSSid, TBool aConnectionNeeded,RArray<TUint32>& aUidsReturned )
-    {
-    return WiFiProt::TWiFiReturn(EWiFiCancel);
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::CancelWiFiProt
-// ---------------------------------------------------------
-//
-EXPORT_C void CWiFiProtUiClient::CancelWiFiProt()
-    {
-    }
-
-// ---------------------------------------------------------
-// CWiFiProtUiClient::StartWiFiProtConnL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWiFiProtUiClient::StartWiFiProtConnL( const TWlanSsid& aSSid,
-                                      TWlanProtectedSetupCredentialAttribute&
-                                        aNetworkSettings,
-                                      WiFiProt::TWiFiReturn& aReturnValue,
-                                      TRequestStatus& aStatus )
-    {
-    }
-    
-// ---------------------------------------------------------
-// Stubs for CWiFiProtSyncClient
-// ---------------------------------------------------------
-//
-
-CWiFiProtSyncClient* CWiFiProtSyncClient::NewL( RWiFiProtSession& aClient,
-                    TInt aPriority )
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-    
-    CWiFiProtSyncClient::CWiFiProtSyncClient( RWiFiProtSession& aClient,
-                                          TInt aPriority ) 
-                                         : CActive( aPriority ),
-                                           iClient( aClient )
-    {
-    }
-
-CWiFiProtSyncClient::~CWiFiProtSyncClient()
-    {
-    }
-    
-
-void CWiFiProtSyncClient::RunL()
-    {
-    }
-    
-void CWiFiProtSyncClient::DoCancel()
-    {
-    }
-    
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/data/EapAkaUi.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,253 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP AKA UI resource file
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-CHARACTER_SET   UTF8
-
-//  RESOURCE IDENTIFIER
-NAME EPAK
-
-//  INCLUDES
-#include <eikon.rh>
-#include "EapAkaUi.hrh"   // Enums for these resources
-#include <eapakaui.loc>   // Localisation file
-#include <wlaneapsettingsui.loc>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-
-//  CONSTANTS  
-#define KUsernameMaxNameLength 255
-#define KEdwinWidth	9
-#define KEdwinLines	5
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF16 { buf = ""; }
-
-RESOURCE CBA r_aka_softkeys_options_back_change
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EAkaUiCmdChange; txt = qtn_msk_change; }
-        };
-    }
-
-RESOURCE DIALOG r_aka_setting_dialog
-    {
-    flags = EAknDialogSelectionList | EEikDialogFlagWait;
-    buttons = r_aka_softkeys_options_back_change;
-    items = 
-        { 
-        DLG_LINE
-            {
-            id = EAkaSettingsListBox;
-            type = EAknCtSettingListBox;
-            control = LISTBOX 
-                {
-                flags = EAknListBoxMenuList;
-                };
-            }
-        }; 
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_aka_username_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_aka_setting_edwin;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_aka_realm_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm;
-    type = EEikCtEdwin;
-    editor_resource_id = r_aka_setting_edwin;
-    }
-
-
-RESOURCE EDWIN r_aka_setting_edwin 
-    {
-    width = KEdwinWidth;
-    lines = KEdwinLines;
-    maxlength = KUsernameMaxNameLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    default_case = EAknEditorLowerCase;
-    avkon_flags = EAknEditorFlagLatinInputModesOnly;
-    flags = EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    }
-
-
-RESOURCE MENU_BAR r_aka_menubar
-    {
-    titles =
-        {
-        MENU_TITLE { menu_pane = r_aka_menu_pane; txt = ""; }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_aka_menu_pane
-    {
-    items=
-        {
-        MENU_ITEM 
-            { 
-            command = EAkaUiCmdChange;
-            txt = qtn_options_change;
-            flags = EEikMenuItemAction;
-            },
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp;
-            txt = qtn_options_help;
-            },
-        MENU_ITEM 
-            {
-            command = EAknCmdExit;
-            txt = qtn_options_exit;
-            }
-        };
-    }
-
-
-// Resource strings
-RESOURCE TBUF r_aka_settings_title            \
-                                           { buf = qtn_wlan_eap_aka_title; }
-RESOURCE TBUF r_aka_username_inusestring      \
-                                 { buf = qtn_wlan_eap_sett_username_inuse; }
-RESOURCE TBUF r_aka_username_inusestring_auto \
-                        { buf = qtn_wlan_eap_sett_username_inuse_from_sim; }
-RESOURCE TBUF r_aka_username_inusestring_conf \
-                            { buf = qtn_wlan_eap_sett_username_inuse_user; }
-RESOURCE TBUF r_aka_username_string           \
-                                       { buf = qtn_wlan_eap_sett_username; }
-RESOURCE TBUF r_aka_realm_inusestring         \
-                                    { buf = qtn_wlan_eap_sett_realm_inuse; }
-RESOURCE TBUF r_aka_realm_inusestring_auto    \
-                           { buf = qtn_wlan_eap_sett_realm_inuse_from_sim; }
-RESOURCE TBUF r_aka_realm_inusestring_conf    \
-                               { buf = qtn_wlan_eap_sett_realm_inuse_user; }
-RESOURCE TBUF r_aka_realm_string              \
-                                          { buf = qtn_wlan_eap_sett_realm; }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_aka_username_autouseconf_texts
-    {
-    setting_texts_resource = r_aka_username_autouseconf_texts_resource;
-    popped_up_texts_resource = r_aka_username_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_aka_username_autouseconf_texts_resource
-    {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_username_inuse_from_sim; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_username_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_aka_username_automatic_useconfigured_array
-    {
-    items =
-        {
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_from_sim; },
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_user; }
-        };
-    }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_aka_realm_autouseconf_texts
-    {
-    setting_texts_resource = r_aka_realm_autouseconf_texts_resource;
-    popped_up_texts_resource = r_aka_realm_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_aka_realm_autouseconf_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_realm_inuse_from_sim;
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_realm_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_aka_realm_automatic_useconfigured_array
-    {
-    items=
-        {
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_from_sim; },
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_user; }
-        };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_aka_display_autouseconf_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm_inuse;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_aka_setting_enumerated_popup;
-    }
-
-
-RESOURCE POPUP_SETTING_LIST r_aka_setting_enumerated_popup
-    {
-    flags=EAknPopupSettingListFlagInitialised;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/inc/EapAkaUi.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP AKA UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _EAPAKAUI_HRH_
-#define _EAPAKAUI_HRH_
-
-
-enum TEapAKaUiMenuCommands
-    {
-    EAkaUiCmdUndefined = 6000,
-    EAkaUiCmdChange
-    };
-
-enum TEapAkaUiNotes
-    {
-    TEapAkaUiGeneralError = 6100
-    };
-
-enum TEapAkaUiLines
-	{
-	EAkaSettingsListBox = 6200
-	};
-
-enum TEapAkaUiSettingIds
-	{
-	EAkaSettingUsernameinUseSettingId=6300,
-	EAkaSettingUsernameSettingId,
-	EAkaSettingPageRealminUseSettingId,
-	EAkaSettingRealmSettingId
-	};
-
-enum TEapAkaUiSettingPageIds
-	{
-	EAkaSettingPageUsernameinUse=6400,
-	EAkaSettingPageUsername,
-	EAkaSettingPageRealminUse,
-	EAkaSettingPageRealm
-	};
-
-
-#endif  //_EAPAKAUI_HRH_
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/inc/EapAkaUiSettingArray.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP AKA UI settings array
-*
-*/
-
-/*
-* %version: 12 %
-*/
-
-#ifndef _EAPAKAUISETTINGARRAY_H_
-#define _EAPAKAUISETTINGARRAY_H_
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-#include "EapAkaUi.hrh"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CEapAkaSettingItemArray : public CBase
-    {
-    public:
-        static CEapAkaSettingItemArray* NewL();
-
-        virtual ~CEapAkaSettingItemArray();
-
-        CAknSettingItem* Item(TEapAkaUiSettingPageIds aItem);
-
-        CAknSettingItemArray* Array();
-
-        void StoreSettingsL();
-
-        void AddTextItemL( TDes& aBuffer,
-                            TInt aId, 
-                            TInt aTitleResource, 
-                            TInt aSettingPageResource, 
-                            TInt aAssociatedResource, 
-                            TInt aOrdinal);
-
-        void AddBinarySettingItemL( TInt aSettingPageResourceId,
-                                    TInt aTitleResourceId,
-                                    TInt aAssociatedResourceId,
-                                    TInt aOrdinal,
-                                    TBool& aModifiedValue);
-
-    protected:
-        CEapAkaSettingItemArray();
-        void ConstructL();
-
-    private:
-        CAknSettingItemArray* iArray;
-    };
-
-#endif  // _EAPAKAUISETTINGARRAY_H_
-
-//  End of File
\ No newline at end of file
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/inc/EapAkaUiView.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP AKA UI setting dialog
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-#ifndef _EAPAKAUIVIEW_H_
-#define _EAPAKAUIVIEW_H_
-
-// INCLUDES
-#include <AknDialog.h>
-#include <eikspane.h> 
-#include <akntitle.h>
-#include <aknsettingitemlist.h>
-#include <aknnavide.h>
-#include <eiklbo.h>
-#include "EapAkaUi.hrh"
-
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CSettingsListBoxItemDrawer;
-class CEapAkaSettingItemArray;
-class CEapAkaUiConnection;
-class CEapAkaUiDataConnection;
-class CEapAkaUiAkaData;
-
-
-// CLASS DECLARATION
-
-/**
-*  Settings dialog class definition
-*/
-class CEapAkaUiDialog : public CAknDialog,
-                        public MEikListBoxObserver
-    {
-    public:
-        CEapAkaUiDialog( CEapAkaUiConnection* aConnection, 
-                         TInt& aButtonId ); 
-
-        ~CEapAkaUiDialog();
- 
-        /**
-        * Create and launch dialog.
-        * @param aResourceId The resource ID of the dialog to load.
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( TInt aResourceId );
-        
-    public: // From MEikListBoxObserver
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-        
-
-    protected:
-        void PreLayoutDynInitL();
-        TBool OkToExitL( TInt aButtonId );
-
-    private:
-        void InitializeSettingsL();
-        void DrawSettingsListL();
-        void ChangeTitleL( TBool aIsStarted );
-        void ShowSettingPageL( TInt aCalledFromMenu ); 
-        void ProcessCommandL( TInt aCommand );
-        void SaveSettings();
-
-    private:
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-
-    private:
-        CEapAkaUiConnection* iConnection; 
-        CEapAkaUiDataConnection* iDataConnection;
-        CEapAkaUiAkaData* iUiData;
-        CEapAkaSettingItemArray* iSettingArray;
-        CAknSettingStyleListBox* iSettingListBox;
-        CSettingsListBoxItemDrawer* iSettingListItemDrawer;
-        CAknNavigationControlContainer* iNaviPane;
-        CAknNavigationDecorator* iNaviDecorator;
-        HBufC* iPreviousText;
-        TInt* iButtonId;
-        
-        // Tells the status of UI construction. TRUE if UI construction is completed.
-		TBool iIsUIConstructionCompleted;
-    };
-
-
-#endif  // _EAPAKAUIVIEW_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/loc/eapakaui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-AKA authentication settings
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:UI title for main view
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_aka_title  "EAP-AKA settings"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUi.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP AKA UI class
-*
-*/
-
-/*
-* %version: 15 %
-*/
-
-// INCLUDE FILES
-#include "EapAkaUi.h"
-#include "EapAkaUiView.h"
-#include <eapakaui.rsg>
-#include <bautils.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "eapAkaui.rsc" );
-
-
-// CLASS DECLARATION
-class TResourceFileCleanupItem
-    {
-    public:
-        CCoeEnv* iCoeEnv;
-        TInt iResourceFileOffset;
-    };
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupResourceFile
-// -----------------------------------------------------------------------------
-//
-static void CleanupResourceFile( TAny* aObject )
-    {
-    TResourceFileCleanupItem* item = 
-                        REINTERPRET_CAST( TResourceFileCleanupItem*, aObject );
-    item->iCoeEnv->DeleteResourceFile( item->iResourceFileOffset );
-    delete item;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapAkaUi::CEapAkaUi
-// -----------------------------------------------------------------------------
-//
-CEapAkaUi::CEapAkaUi( CEapAkaUiConnection* aConnection ) 
-: iConnection( aConnection )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUi::NewL
-// -----------------------------------------------------------------------------
-//
-CEapAkaUi* CEapAkaUi::NewL( CEapAkaUiConnection* aConnection )
-    {
-    CEapAkaUi* self = new ( ELeave ) CEapAkaUi( aConnection );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUi::ConstructL()
-// -----------------------------------------------------------------------------
-//
-void CEapAkaUi::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUi::~CEapAkaUi
-// -----------------------------------------------------------------------------
-//
-CEapAkaUi::~CEapAkaUi()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUi::InvokeUiL
-// -----------------------------------------------------------------------------
-//
-TInt CEapAkaUi::InvokeUiL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    CCoeEnv* coeEnv = CCoeEnv::Static();
-    BaflUtils::NearestLanguageFile( coeEnv->FsSession(), fileName );
-
-    TResourceFileCleanupItem* item = new( ELeave ) TResourceFileCleanupItem;
-
-    item->iCoeEnv = coeEnv;
-    CleanupStack::PushL( TCleanupItem( CleanupResourceFile, item ) );
-    item->iResourceFileOffset = coeEnv->AddResourceFileL( fileName );
-
-    TInt buttonId;
-    CEapAkaUiDialog* settingsDlg = new( ELeave ) CEapAkaUiDialog( iConnection, 
-                                                                  buttonId );
-    settingsDlg->ConstructAndRunLD( R_AKA_SETTING_DIALOG );
-
-    CleanupStack::PopAndDestroy();  // For resource file
-
-    return buttonId;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUiSettingArray.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP AKA UI settings array
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-// INCLUDE FILES
-#include "EapAkaUiSettingArray.h"
-#include "EapAkaUi.hrh"
-#include <aknsettingitemlist.h>
-#include <akntextsettingpage.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::CEapAkaSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapAkaSettingItemArray::CEapAkaSettingItemArray()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::NewL
-// -----------------------------------------------------------------------------
-//
-CEapAkaSettingItemArray* CEapAkaSettingItemArray::NewL() 
-    {
-    CEapAkaSettingItemArray* self = new( ELeave ) CEapAkaSettingItemArray();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); 
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::~CEapAkaSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapAkaSettingItemArray::~CEapAkaSettingItemArray()
-    {
-    if( iArray ) 
-        {
-        // ResetAndDestroy()
-        iArray->ResetAndDestroy();
-        }    
-    delete iArray;   
-    iArray = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::Item
-// -----------------------------------------------------------------------------
-//
-CAknSettingItem* CEapAkaSettingItemArray::Item( TEapAkaUiSettingPageIds aId )
-    {
-    for( TInt i = 0; i < iArray->Count(); i++ )
-        {
-        if( iArray->At( i )->Identifier() == aId )
-            {
-            return iArray->At( i );
-            }
-        }
-
-    __ASSERT_DEBUG( EFalse, User::Invariant() );
-    return NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::Array
-// -----------------------------------------------------------------------------
-//
-CAknSettingItemArray* CEapAkaSettingItemArray::Array() 
-    {
-    return iArray;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::StoreSettingsL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaSettingItemArray::StoreSettingsL()
-    {
-    // Do what SettingItemList::StoreSettings would do. 
-    for( TInt i( 0 ); i < iArray->Count(); ++i ) 
-        {
-        iArray->At( i )->StoreL();
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaSettingItemArray::ConstructL() 
-    {
-    iArray = new( ELeave ) CAknSettingItemArray( 2, EFalse, 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::AddTextItemL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaSettingItemArray::AddTextItemL( TDes& aBuffer, 
-                                          TInt aId, 
-                                          TInt aTitleResource, 
-                                          TInt aSettingPageResource, 
-                                          TInt aAssociatedResource, 
-                                          TInt aOrdinal )
-    {
-    // Create new setting item
-    CAknTextSettingItem* settingItem = new( ELeave ) CAknTextSettingItem( aId,
-                                                                    aBuffer );
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KNullDesC );
-    settingItem->SetSettingPageFlags( 
-                                    CAknTextSettingPage::EZeroLengthAllowed );
-
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResource );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResource );
-
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-
-    CleanupStack::PopAndDestroy( itemTitle );
-
-    // Items are destroyed in destructor when resetting array
-    CleanupStack::Pop( settingItem ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaSettingItemArray::AddBinarySettingItemL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaSettingItemArray::AddBinarySettingItemL( 
-                                                TInt aSettingPageResourceId,
-                                                TInt aTitleResourceId, 
-                                                TInt aAssociatedResourceId,
-                                                TInt aOrdinal, 
-                                                TBool& aModifiedValue )
-    {
-    CAknSettingItem* settingItem = new ( ELeave ) 
-    CAknBinaryPopupSettingItem( 0, aModifiedValue );
-    CleanupStack::PushL( settingItem );
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResourceId );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResourceId, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResourceId );
-
-    iArray->AppendL( settingItem );
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapAka/ConfigUi/src/EapAkaUiView.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,462 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP AKA UI settings dialog
-*
-*/
-
-/*
-* %version: 30 %
-*/
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include "EapAkaUiView.h"
-#include "EapAkaUi.hrh"
-#include <eapakaui.rsg>
-#include <akntextsettingpage.h>
-#include <aknsettingitemlist.h>
-#include "EapAkaUiSettingArray.h"
-#include <EapAkaUiConnection.h>
-#include <EapAkaUiDataConnection.h>
-#include <EapAkaUiAkaData.h> 
-
-#include <featmgr.h>
-#include <hlplch.h>
-
-
-// LOCAL CONSTANTS AND MACROS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
-
-_LIT( KEmptyString, "" );
-
-
-// MODULE DATA STRUCTURES
-enum 
-    {
-    EUsernameInUseItem = 0,
-    EUsernameItem,
-    ERealmInUseItem,
-    ERealmItem
-    };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::CEapAkaUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapAkaUiDialog::CEapAkaUiDialog( CEapAkaUiConnection* aConnection, 
-								  TInt& aButtonId ) 
-: CAknDialog(),
-  iConnection( aConnection ),
-  iDataConnection( 0 ), 
-  iUiData( 0 ), 
-  iSettingArray( 0 ), 
-  iSettingListBox( 0 ), 
-  iSettingListItemDrawer( 0 ), 
-  iNaviPane( 0 ), 
-  iNaviDecorator( 0 ), 
-  iPreviousText( 0 ),
-  iButtonId( &aButtonId ),
-  iIsUIConstructionCompleted( EFalse )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CEapAkaUiDialog::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CEapAkaUiDialog::ConstructAndRunLD( TInt aResourceId )
-    {
-    CleanupStack::PushL( this );
-
-    iSettingArray = CEapAkaSettingItemArray::NewL();
-
-    User::LeaveIfError( iConnection->Connect() );
-    iDataConnection = iConnection->GetDataConnection();
-    if ( iDataConnection == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iDataConnection->Open() );
-    User::LeaveIfError( iDataConnection->GetData( &iUiData ) );
-
-    FeatureManager::InitializeLibL();
-
-    ConstructL( R_AKA_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-    
-    return CAknDialog::ExecuteLD( aResourceId );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::~CEapAkaUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapAkaUiDialog::~CEapAkaUiDialog()
-    {
-    if ( iSettingArray )
-        {
-        iSettingArray->Array()->ResetAndDestroy();
-        delete iSettingArray;
-        }
-
-    delete iNaviDecorator;
-    iNaviDecorator = NULL;
-
-    iSettingListBox = 0;
-    iSettingListItemDrawer = 0;
-
-    iDataConnection->Close();
-    delete iDataConnection;
-    iConnection->Close();
-    delete iPreviousText;
-    
-    FeatureManager::UnInitializeLib();
-    }
-    
-// ---------------------------------------------------------
-// CEapAkaUiDialog::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CEapAkaUiDialog::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                   TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            OkToExitL( EAkaUiCmdChange );         
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }    
-
-    
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaUiDialog::PreLayoutDynInitL()
-    {
-    ChangeTitleL( ETrue );
-
-    TUid naviPaneUid;
-    naviPaneUid.iUid = EEikStatusPaneUidNavi;
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( naviPaneUid );
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>( 
-                                        statusPane->ControlL( naviPaneUid ) );
-
-        // Set empty text to hide tabs.
-        iNaviDecorator = iNaviPane->CreateNavigationLabelL( KEmptyString );
-        iNaviPane->PushL( *iNaviDecorator );
-        }
-    
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                        ControlOrNull( EAkaSettingsListBox ) );
-    iSettingListItemDrawer=static_cast<CSettingsListBoxItemDrawer*>( 
-                                        iSettingListBox->ItemDrawer() ); 
-    iSettingListBox->SetMopParent( this );
-    iSettingListBox->CreateScrollBarFrameL( ETrue );
-    iSettingListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iSettingListBox->SetListBoxObserver( this );                                                
-    DrawSettingsListL();
-    
-    iIsUIConstructionCompleted = ETrue;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::ShowSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaUiDialog::ShowSettingPageL( TInt aCalledFromMenu ) 
-    {
-    TInt index = iSettingListBox->CurrentItemIndex();
-    CAknSettingItem* item = iSettingArray->Array()->At( index );
-    item->EditItemL( aCalledFromMenu );
-    item->StoreL();
-    DrawNow();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CEapAkaUiDialog::OkToExitL( TInt aButtonId )
-    {
-    TBool ret( EFalse );
-    switch ( aButtonId )
-        {
-        case EEikBidOk:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                if ( iSettingListBox->IsFocused() )
-                    {
-                    ShowSettingPageL( EFalse );
-                    }
-                }
-            else
-                {
-                #if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapAkaUiDialog::OkToExitL - UI not ready - Ignoring key press.\n") );
-				#endif
-                }
-            break;
-            }
-
-        case EAknSoftkeyOptions:
-            {
-            DisplayMenuL();
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                iDataConnection->Update();
-                ChangeTitleL( EFalse );
-                ret = ETrue;
-                }
-            break;
-            }
-        case EAkaUiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-			    {
-				ShowSettingPageL( EFalse );
-			    }
-			else
-			    {
-				#if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapAkaUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-				#endif						
-			    }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-
-    if ( ret )
-        {
-        *iButtonId = aButtonId;
-        }
-
-    return ret;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::DrawSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaUiDialog::DrawSettingsListL()
-    {  
-    iSettingArray->Array()->ResetAndDestroy();
-    TInt ordinal = 0;
-    iSettingArray->AddBinarySettingItemL( R_AKA_DISPLAY_AUTOUSECONF_PAGE,
-                                            R_AKA_USERNAME_INUSESTRING, 
-                                            R_AKA_USERNAME_AUTOUSECONF_TEXTS,
-                                            ordinal++,
-                                            *iUiData->GetUseManualUsername() );
-
-    iSettingArray->AddTextItemL( iUiData->GetManualUsername(),
-                                EAkaSettingPageUsername,
-                                R_AKA_USERNAME_STRING,
-                                R_AKA_USERNAME_PAGE,
-                                NULL,
-                                ordinal++ );
-
-
-    iSettingArray->AddBinarySettingItemL( R_AKA_DISPLAY_AUTOUSECONF_PAGE, 
-                                            R_AKA_REALM_INUSESTRING, 
-                                            R_AKA_REALM_AUTOUSECONF_TEXTS,
-                                            ordinal++,
-                                            *iUiData->GetUseManualRealm() );
-
-    iSettingArray->AddTextItemL( iUiData->GetManualRealm(),
-                                EAkaSettingUsernameSettingId,
-                                R_AKA_REALM_STRING,
-                                R_AKA_REALM_PAGE,
-                                NULL,
-                                ordinal++ );
-
-    iSettingListBox->Model()->SetItemTextArray( iSettingArray->Array() );
-    iSettingListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iSettingArray->Array()->RecalculateVisibleIndicesL();
-    iSettingListBox->HandleItemAdditionL();
-    iSettingListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::ChangeTitleL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaUiDialog::ChangeTitleL( TBool aIsStarted )
-    {
-    TUid titlePaneUid;
-    titlePaneUid.iUid=EEikStatusPaneUidTitle;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( titlePaneUid );
-
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        CAknTitlePane* titlePane = static_cast<CAknTitlePane*>( 
-                                        statusPane->ControlL( titlePaneUid ) );
-        if ( aIsStarted )
-            {
-            // Store previous application title text
-            const TDesC* prevText = titlePane->Text();  
-
-            iPreviousText = HBufC::NewL( prevText->Length() );
-            iPreviousText->Des().Append( *prevText );
-            TDesC* titleText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_AKA_SETTINGS_TITLE );
-            titlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText ); 
-            }
-        else
-            {
-            // Set calling application title text back
-            titlePane->SetTextL( *iPreviousText );  
-
-            // pop navidecorator when exiting
-            iNaviPane->Pop( iNaviDecorator );   
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaUiDialog::DynInitMenuPaneL( TInt aResourceId, 
-                                         CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aResourceId == R_AKA_MENU_PANE )
-        {
-        if ( aMenuPane && !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CEapAkaUiDialog::ProcessCommandL( TInt aCommand )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    switch( aCommand )
-        {
-        case EAknCmdExit:
-            {
-            TryExitL( aCommand );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case EAkaUiCmdChange:
-            {
-			if( iIsUIConstructionCompleted )
-			    {
-				ShowSettingPageL( ETrue );
-			    }
-			else
-			    {
-				#if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapAkaUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-				#endif						
-			    }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapAkaUiDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CEapAkaUiDialog::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/data/EapGtcUi.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP GTC UI resource file
-*
-*/
-
-/*
-* %version: 14 %
-*/
-
-CHARACTER_SET   UTF8
-
-//  RESOURCE IDENTIFIER
-NAME EPGT
-
-//  INCLUDES
-#include <eikon.rh>
-#include "EapGtcUi.hrh"   // Enums for these resources
-#include <eapgtcui.loc>   // Localisation file
-#include <wlaneapsettingsui.loc>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-
-//  CONSTANTS  
-#define KUsernameMaxNameLength 255
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF16 { buf=""; }
-
-RESOURCE CBA r_gtc_ui_softkeys_options_back_change
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EGtcUiCmdChange; txt = qtn_msk_change; }
-        };
-    }
-
-
-RESOURCE DIALOG r_gtc_setting_dialog
-    {
-    flags = EAknDialogSelectionList|EEikDialogFlagWait;
-    buttons = r_gtc_ui_softkeys_options_back_change;
-    items= 
-        { 
-        DLG_LINE
-            {
-            id = EGtcSettingsListBox;
-            type = EAknCtSettingListBox;
-            control = LISTBOX 
-                {
-                flags = EAknListBoxMenuList;
-                };
-            }
-        }; 
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_gtc_username_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_gtc_setting_edwin;
-    }
-
-
-RESOURCE EDWIN r_gtc_setting_edwin 
-    {
-    width = 9;
-    lines = 5;
-    maxlength = 255;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    flags = EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    }
-
-
-RESOURCE MENU_BAR r_gtc_menubar
-    {
-    titles =
-        {
-        MENU_TITLE { menu_pane = r_gtc_menu_pane; txt=""; }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_gtc_menu_pane
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EGtcUiCmdChange;
-            txt = qtn_options_change;
-            flags = EEikMenuItemAction;
-            },
-        MENU_ITEM
-            {
-            command = EAknCmdHelp;
-            txt = qtn_options_help;
-            },
-        MENU_ITEM
-            {
-            command = EAknCmdExit;
-            txt = qtn_options_exit;
-            }
-        };
-    }
-
-
-// Resource strings
-RESOURCE TBUF r_gtc_settings_title      { buf = qtn_wlan_eap_gtc_title; }
-RESOURCE TBUF r_gtc_username_string     { buf = qtn_wlan_eap_sett_username; }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/inc/EapGtcUi.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP GTC UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _EAPGTCUI_HRH_
-#define _EAPGTCUI_HRH_
-
-enum TEapGtcUiMenuCommands
-    {
-    EGtcUiCmdUndefined = 6000,
-    EGtcUiCmdChange
-    };
-
-enum TEapGtcUiNotes
-    {
-    TEapGtcUiGeneralError = 6100
-    };
-
-enum TEapGtcUiLines
-	{
-	EGtcSettingsListBox = 6200
-	};
-
-enum TEapGtcUiSettingIds
-	{
-	EGtcSettingUsernameinUseSettingId=6300,
-	EGtcSettingUsernameSettingId,
-	EGtcSettingPageRealminUseSettingId,
-	EGtcSettingRealmSettingId
-	};
-
-enum TEapGtcUiSettingPageIds
-	{
-	EGtcSettingPageUsernameinUse=6400,
-	EGtcSettingPageUsername,
-	EGtcSettingPageRealminUse,
-	EGtcSettingPageRealm
-	};
-
-
-#endif  //_EAPGTCUI_HRH_
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/inc/EapGtcUiSettingArray.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP GTC UI settings array
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPGTCUISETTINGARRAY_H_
-#define _EAPGTCUISETTINGARRAY_H_
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-#include "EapGtcUi.hrh"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CEapGtcSettingItemArray : public CBase
-    {
-    public:
-        static CEapGtcSettingItemArray* NewL();
-
-        virtual ~CEapGtcSettingItemArray();
-
-        CAknSettingItem* Item( TEapGtcUiSettingPageIds aItem );
-
-        CAknSettingItemArray* Array();
-
-        void StoreSettingsL();
-
-        void AddTextItemL( TDes& aBuffer, 
-                            TInt aId, 
-                            TInt aTitleResource, 
-                            TInt aSettingPageResource, 
-                            TInt aAssociatedResource, 
-                            TInt aOrdinal);
-
-    protected:
-        CEapGtcSettingItemArray();
-
-        void ConstructL();
-
-    private:
-        CAknSettingItemArray* iArray;
-    };
-
-#endif  // _EAPGTCUISETTINGARRAY_H_
-
-//  End of File
\ No newline at end of file
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/inc/EapGtcUiView.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP GTC UI setting dialog
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-#ifndef _EAPGTCUIVIEW_H_
-#define _EAPGTCUIVIEW_H_
-
-// INCLUDES
-#include <AknDialog.h>        
-#include <eikspane.h>
-#include <akntitle.h>
-#include <aknsettingitemlist.h>
-#include "EapGtcUi.hrh"
-#include <aknnavi.h>
-#include <eiklbo.h>
-
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CSettingsListBoxItemDrawer;
-class CEapGtcSettingItemArray;
-class CEapGtcUiConnection;
-class CEapGtcUiGtcData;
-class CEapGtcUiDataConnection;
-
-
-// CLASS DECLARATION
-
-/**
-*  Settings dialog class definition
-*/
-class CEapGtcUiDialog : public CAknDialog,
-                        public MEikListBoxObserver
-    {
-    public:
-        CEapGtcUiDialog( CEapGtcUiConnection* aConnection, 
-                         TInt& aButtonId );
-
-        ~CEapGtcUiDialog();
- 
-        /**
-        * Create and launch dialog.
-        * @param aResourceId The resource ID of the dialog to load.
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( TInt aResourceId );
-        
-                
-    public: // From MEikListBoxObserver
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );                
-
-
-    protected:
-        void PreLayoutDynInitL();
-        TBool OkToExitL( TInt aButtonId );
-
-    private:
-        void InitializeSettingsL();
-        void DrawSettingsListL();
-        void ChangeTitleL( TBool aIsStarted );
-        void ShowSettingPageL( TInt aCalledFromMenu ); 
-        void ProcessCommandL( TInt aCommand );
-        void SaveSettings();
-
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-
-    private:
-        CEapGtcUiConnection* iConnection;
-        CEapGtcUiGtcData* iUiData;
-        CEapGtcUiDataConnection* iDataConnection;
-        CEapGtcSettingItemArray* iSettingArray;
-        CAknSettingStyleListBox* iSettingListBox;
-        CSettingsListBoxItemDrawer* iSettingListItemDrawer;
-        CAknNavigationControlContainer* iNaviPane;
-        CAknNavigationDecorator* iNaviDecorator;
-        HBufC* iPreviousText;
-        TInt* iButtonId;
-        
-        // Tells the status of UI construction. TRUE if UI construction is completed.
-		TBool iIsUIConstructionCompleted;
-    };
-
-#endif // _EAPGTCUIVIEW_H_
-
-//  End of File
\ No newline at end of file
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/loc/eapgtcui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-GTC authentication settings
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:UI title for main view
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_gtc_title  "EAP-GTC settings"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUi.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP GTC UI class
-*
-*/
-
-/*
-* %version: 15 %
-*/
-
-// INCLUDE FILES
-#include <EapGtcUiConnection.h>
-#include <eapgtcui.rsg>
-#include <bautils.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-#include <data_caging_path_literals.hrh>
-
-#include "EapGtcUi.h"
-#include "EapGtcUiView.h"
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "eapgtcui.rsc");
-
-
-// CLASS DECLARATION
-class TResourceFileCleanupItem
-    {
-    public:
-        CCoeEnv* iCoeEnv;
-        TInt iResourceFileOffset;
-    }; 
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupResourceFile
-// -----------------------------------------------------------------------------
-//
-static void CleanupResourceFile( TAny* aObject )
-    {
-    TResourceFileCleanupItem* item = 
-                        REINTERPRET_CAST( TResourceFileCleanupItem*,aObject );
-    item->iCoeEnv->DeleteResourceFile( item->iResourceFileOffset );
-    delete item;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapGtcUi::CEapGtcUi
-// -----------------------------------------------------------------------------
-//
-CEapGtcUi::CEapGtcUi( CEapGtcUiConnection* aConnection ) 
-: iConnection( aConnection )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUi::NewL
-// -----------------------------------------------------------------------------
-//
-CEapGtcUi* CEapGtcUi::NewL( CEapGtcUiConnection* aConnection )
-    {
-    CEapGtcUi* self = new ( ELeave ) CEapGtcUi( aConnection );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUi::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcUi::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUi::~CEapGtcUi
-// -----------------------------------------------------------------------------
-//
-CEapGtcUi::~CEapGtcUi()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUi::InvokeUiL
-// -----------------------------------------------------------------------------
-//
-TInt CEapGtcUi::InvokeUiL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    CCoeEnv* coeEnv = CCoeEnv::Static();
-    BaflUtils::NearestLanguageFile( coeEnv->FsSession(), fileName );
-
-    TResourceFileCleanupItem* item = new( ELeave ) TResourceFileCleanupItem;
-
-     item->iCoeEnv = coeEnv;
-    CleanupStack::PushL( TCleanupItem( CleanupResourceFile, item ) );
-    item->iResourceFileOffset = coeEnv->AddResourceFileL( fileName );
-
-    TInt buttonId;
-    CEapGtcUiDialog* settingsDlg = new( ELeave ) CEapGtcUiDialog( iConnection,
-                                                                  buttonId );
-    settingsDlg->ConstructAndRunLD( R_GTC_SETTING_DIALOG );
-
-    CleanupStack::PopAndDestroy();  // For resource file
-
-    return buttonId;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUiSettingArray.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP GTC UI settings array
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-// INCLUDE FILES
-#include "EapGtcUiSettingArray.h"
-#include "EapGtcUi.hrh"
-#include <aknsettingitemlist.h>
-#include <akntextsettingpage.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapGtcSettingItemArray::CEapGtcSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapGtcSettingItemArray::CEapGtcSettingItemArray()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcSettingItemArray::NewL
-// -----------------------------------------------------------------------------
-//
-CEapGtcSettingItemArray* CEapGtcSettingItemArray::NewL() 
-    {
-    CEapGtcSettingItemArray* self = new (ELeave) CEapGtcSettingItemArray();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop( self ); 
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcSettingItemArray::~CEapGtcSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapGtcSettingItemArray::~CEapGtcSettingItemArray()
-    {
-    if( iArray ) 
-        {
-        // ResetAndDestroy()
-        iArray->ResetAndDestroy();
-        }    
-    delete iArray;   
-    iArray = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcSettingItemArray::Item
-// -----------------------------------------------------------------------------
-//
-CAknSettingItem* CEapGtcSettingItemArray::Item( TEapGtcUiSettingPageIds aId )
-    {
-    for( TInt i = 0; i < iArray->Count(); i++ )
-        {
-        if( iArray->At( i )->Identifier() == aId )
-            {
-            return iArray->At( i );
-            }
-        }
-
-    __ASSERT_DEBUG( EFalse, User::Invariant() );
-    return NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcSettingItemArray::Array
-// -----------------------------------------------------------------------------
-//
-CAknSettingItemArray* CEapGtcSettingItemArray::Array() 
-    {
-    return iArray;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcSettingItemArray::StoreSettingsL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcSettingItemArray::StoreSettingsL()
-    {
-    // Do what SettingItemList::StoreSettings would do. 
-    for( TInt i(0); i < iArray->Count(); ++i )
-        {
-        iArray->At(i)->StoreL();
-       }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcSettingItemArray::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcSettingItemArray::ConstructL() 
-    {
-    iArray = new ( ELeave ) CAknSettingItemArray( 2, EFalse, 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcSettingItemArray::AddTextItemL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcSettingItemArray::AddTextItemL( TDes& aBuffer, 
-                                            TInt aId, 
-                                            TInt aTitleResource, 
-                                            TInt aSettingPageResource,
-                                            TInt aAssociatedResource, 
-                                            TInt aOrdinal)
-    {
-    // Create new setting item
-    CAknTextSettingItem* settingItem = new ( ELeave ) CAknTextSettingItem( aId,
-                                                                    aBuffer );
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KNullDesC );
-    settingItem->SetSettingPageFlags( 
-                                    CAknTextSettingPage::EZeroLengthAllowed );
-
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResource );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList,
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    
-    CleanupStack::PopAndDestroy( itemTitle );
-
-    // Items are destroyed in destructor when resetting array
-    CleanupStack::Pop( settingItem ); 
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/ConfigUi/src/EapGtcUiView.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,455 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP GTC UI settings dialog
-*
-*/
-
-/*
-* %version: 29 %
-*/
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include <eapgtcui.rsg>
-#include <akntextsettingpage.h>
-#include <aknsettingitemlist.h>
-#include <aknnavide.h>
-#include <aknnotewrappers.h> // TEMPORARY, for info message...
-#include <EapGtcUiConnection.h>
-#include <EapGtcUiDataConnection.h>
-#include <EapGtcUiGtcData.h>
-
-#include "EapGtcUiView.h"
-#include "EapGtcUi.hrh"
-#include "EapGtcUiSettingArray.h"
-
-#include <featmgr.h>
-#include <hlplch.h>
-
-
-// CONSTANTS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
-
-_LIT( KEmptyString, "" );
-
-// MODULE DATA STRUCTURES
-enum 
-    {
-    EUsernameItem = 0
-    };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::CEapGtcUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapGtcUiDialog::CEapGtcUiDialog( CEapGtcUiConnection* aConnection, 
-								  TInt& aButtonId ) 
-: CAknDialog(),
-  iConnection( aConnection ),
-  iDataConnection( 0 ), 
-  iSettingArray( 0 ), 
-  iSettingListBox( 0 ), 
-  iSettingListItemDrawer( 0 ), 
-  iNaviPane( 0 ), 
-  iNaviDecorator( 0 ), 
-  iPreviousText( 0 ), 
-  iButtonId( &aButtonId ),
-  iIsUIConstructionCompleted( EFalse )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CEapGtcUiDialog::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CEapGtcUiDialog::ConstructAndRunLD( TInt aResourceId )
-    {
-    CleanupStack::PushL( this );
-    iSettingArray = CEapGtcSettingItemArray::NewL();
-
-    User::LeaveIfError( iConnection->Connect() );
-
-    iDataConnection = iConnection->GetDataConnection();
-    if ( iDataConnection == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iDataConnection->Open() );
-    User::LeaveIfError( iDataConnection->GetData( &iUiData ) );
-
-    FeatureManager::InitializeLibL();
-
-    ConstructL( R_GTC_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-    
-    return CAknDialog::ExecuteLD( aResourceId );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::~CEapGtcUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapGtcUiDialog::~CEapGtcUiDialog()
-    {
-    if ( iNaviDecorator )
-        {
-        delete iNaviDecorator;
-        iNaviDecorator = NULL;
-        }
-
-    if ( iSettingArray )
-        {
-        iSettingArray->Array()->ResetAndDestroy();
-        delete iSettingArray;
-        }
-
-    if ( iSettingListBox )
-        {
-        iSettingListBox = 0;
-        }
-
-    if ( iSettingListItemDrawer )
-        {
-        iSettingListItemDrawer = 0;
-        }
-
-    if ( iDataConnection )
-        {
-        iDataConnection->Close();
-        delete iDataConnection;
-        }
-
-    if ( iConnection )
-        {
-        iConnection->Close();
-        }
-
-    delete iPreviousText;
-    
-    FeatureManager::UnInitializeLib();
-    }
-    
-// ---------------------------------------------------------
-// CEapGtcUiDialog::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CEapGtcUiDialog::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                   TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            OkToExitL( EGtcUiCmdChange );         
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }    
-
-    
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcUiDialog::PreLayoutDynInitL()
-    {
-    TUid naviPaneUid;
-    naviPaneUid.iUid = EEikStatusPaneUidNavi;
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( naviPaneUid );
-
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>( 
-                                        statusPane->ControlL( naviPaneUid ) );
-
-        // Set empty text to hide tabs.
-        iNaviDecorator = iNaviPane->CreateNavigationLabelL( KEmptyString );   
-        iNaviPane->PushL( *iNaviDecorator );
-        }
-
-    // Change title
-    ChangeTitleL( ETrue );
-
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                        ControlOrNull( EGtcSettingsListBox ) );
-    iSettingListItemDrawer = static_cast<CSettingsListBoxItemDrawer*>( 
-                                        iSettingListBox->ItemDrawer() ); 
-    iSettingListBox->SetMopParent( this );
-    iSettingListBox->CreateScrollBarFrameL( ETrue );
-    iSettingListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff, 
-                                                CEikScrollBarFrame::EAuto );
-    iSettingListBox->SetListBoxObserver( this );                                                
-    DrawSettingsListL();
-    
-    iIsUIConstructionCompleted = ETrue;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::ShowSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcUiDialog::ShowSettingPageL( TInt aCalledFromMenu ) 
-    {
-    TInt index = iSettingListBox->CurrentItemIndex();
-    CAknSettingItem* item = iSettingArray->Array()->At( index );
-    item->EditItemL( aCalledFromMenu );
-    item->StoreL();
-    DrawSettingsListL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CEapGtcUiDialog::OkToExitL( TInt aButtonId )
-    {
-    TBool ret( EFalse );
-    switch ( aButtonId )
-        {
-        case EEikBidOk:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                if ( iSettingListBox->IsFocused() )
-                    {
-                    ShowSettingPageL( EFalse );
-                    }
-                }
-            else
-                {
-                #if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapGtcUiDialog::OkToExitL - UI not ready - Ignoring key press.\n") );
-				#endif
-                }
-            break;
-            }
-
-        case EAknSoftkeyOptions:
-            {
-            DisplayMenuL();
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                iDataConnection->Update();
-                ChangeTitleL( EFalse );
-                ret = ETrue;
-                }
-            break;
-            }
-            
-        case EGtcUiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-				{
-    			ShowSettingPageL( EFalse );
-				}
-			else
-			    {
-				#if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapGtcUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-				#endif						
-			    }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-
-    if ( ret )
-        {
-        *iButtonId = aButtonId;
-        }
-
-    return ret;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::DrawSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcUiDialog::DrawSettingsListL()
-    {  
-    iSettingArray->Array()->ResetAndDestroy();
-    TInt ordinal = 0;
-    iSettingArray->AddTextItemL( iUiData->GetIdentity(),
-                                EGtcSettingPageUsername,
-                                R_GTC_USERNAME_STRING,
-                                R_GTC_USERNAME_PAGE,
-                                NULL,
-                                ordinal++ );
-
-    iSettingListBox->Model()->SetItemTextArray( iSettingArray->Array() );    
-    iSettingListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iSettingArray->Array()->RecalculateVisibleIndicesL();
-    iSettingListBox->HandleItemAdditionL();
-    iSettingListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::ChangeTitleL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcUiDialog::ChangeTitleL( TBool aIsStarted )
-    {
-    TUid titlePaneUid;
-    titlePaneUid.iUid = EEikStatusPaneUidTitle;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( titlePaneUid );
-
-    if (subPane.IsPresent()&&subPane.IsAppOwned())
-        {
-        CAknTitlePane* titlePane = static_cast<CAknTitlePane*>( 
-                                        statusPane->ControlL( titlePaneUid ) );
-        if ( aIsStarted )
-            {
-            // Store previous application title text
-            const TDesC* prevText = titlePane->Text();  
-            iPreviousText = HBufC::NewL( prevText->Length() );
-            iPreviousText->Des().Append( *prevText );
-            TDesC* titleText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_GTC_SETTINGS_TITLE );
-            titlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText ); 
-            }
-        else
-            {
-            // Set calling application title text back
-            titlePane->SetTextL( *iPreviousText );  
-            iNaviPane->Pop( iNaviDecorator );
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcUiDialog::DynInitMenuPaneL( TInt aResourceId, 
-                                         CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aResourceId == R_GTC_MENU_PANE )
-        {
-        if ( aMenuPane && !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CEapGtcUiDialog::ProcessCommandL( TInt aCommand )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    switch( aCommand )
-        {
-        case EAknCmdExit:
-            {
-            TryExitL( aCommand );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case EGtcUiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-				{
-    			ShowSettingPageL( ETrue );
-				}
-			else
-			    {
-				#if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapGtcUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-				#endif						
-			    }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapGtcUiDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CEapGtcUiDialog::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/data/GtcNotifDlgUi.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Resorce file of GtcNotif.
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-// RESOURCE IDENTIFIER
-NAME EGTC
-
-
-// INCLUDES
-#include <eikon.rh>
-#include <eikon.rsg>
-
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <apsettings.mbg>
-
-#include <avkon.hrh>
-#include <avkon.loc>
-
-#include <gtcnotifdlg.loc>
-
-
-// RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE CBA r_gtcnotif_softkeys_ok_cancel_select
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = text_softkey_ok; },
-        CBA_BUTTON { id = EAknSoftkeyCancel; txt = text_softkey_cancel; },
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = qtn_msk_select; }
-        };
-    }
-    
-
-RESOURCE DIALOG r_gtc_password_query
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar | 
-            EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-    buttons = r_gtcnotif_softkeys_ok_cancel_select;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control= AVKON_DATA_QUERY 
-                { 
-                layout = ECodeLayout;
-                label = "";
-                control = SECRETED 
-                    {
-                    num_letters = 255;
-                    };
-                };
-            }
-        };
-    }
-    
-
-RESOURCE CBA r_gtcnotif_softkeys_ok___select
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = text_softkey_ok; },
-        CBA_BUTTON { },
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = qtn_msk_select; }
-        };
-    }
-
-
-RESOURCE DIALOG r_message_query
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar | 
-            EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-    buttons = r_gtcnotif_softkeys_ok___select;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_wlan_eap_gtc_notif_message;
-                };
-            },
-
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                };
-            }
-        };
-    }
-
-
-RESOURCE TBUF r_gtc_response    { buf = qtn_wlan_eap_gtc_notif_response; }
-RESOURCE TBUF r_gtc_message     { buf = qtn_wlan_eap_gtc_notif_message; }
-RESOURCE TBUF r_gtc_username    { buf = qtn_wlan_eap_gtc_notif_username; }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/inc/GTCMessageDisplayDialog.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of Gtc Message Display Dialog
-*
-*/
-
-/*
-* %version: tr1cfwln#11 %
-*/
-
-#ifndef __GTCMESSAGEDISPLAYDIALOG_H__
-#define __GTCMESSAGEDISPLAYDIALOG_H__
-
-// INCLUDES
-#include <aknmessagequerydialog.h>
-
-
-class CGTCMessageDisplayDialog : public CAknMessageQueryDialog
-    {
-    public:
-        static CGTCMessageDisplayDialog* NewL( const TDesC& aMessage, 
-                                               CGtcDialogPlugin* aPlugin );
-        ~CGTCMessageDisplayDialog();
-  
-    private:
-        CGTCMessageDisplayDialog( CGtcDialogPlugin* aPlugin );
-
-        virtual TBool OkToExitL( TInt aButtonId );
-        void HandleResourceChange( TInt aType );
-        
-    private:
-        CGtcDialogPlugin* iPlugin;     // Pointer to the notifier plugin
-    };
-
-#endif  // __GTCMESSAGEDISPLAYDIALOG_H__
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/inc/GTCResponseQueryDialog.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of Gtc Response Query Dialog
-*
-*/
-
-/*
-* %version: tr1cfwln#11 %
-*/
-
-#ifndef __GTCRESPONSEQUERYDIALOG_H__
-#define __GTCRESPONSEQUERYDIALOG_H__
-
-// INCLUDES
-#include <AknQueryDialog.h>
-
-
-class CGTCResponseQueryDialog : public CAknTextQueryDialog
-    {
-    public:
-        static CGTCResponseQueryDialog* NewL( TDes& aResponse, 
-                                              CGtcDialogPlugin* aPlugin );
-        ~CGTCResponseQueryDialog();
-  
-    private:
-        CGTCResponseQueryDialog( TDes& aResponse, CGtcDialogPlugin* aPlugin );
-
-        virtual TBool OkToExitL( TInt aButtonId );
-        void HandleResourceChange( TInt aType );
-        
-    private:
-        CGtcDialogPlugin* iPlugin;     // Pointer to the notifier plugin
-    };
-
-
-#endif  // __GTCMESSAGEDISPLAYDIALOG_H__
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/inc/GtcNotifDlgPlugin.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of GtcNotifDlg Dialog Plugins
-*
-*/
-
-/*
-* %version: 11.1.7 %
-*/
-
-#ifndef __GTCNOTIFDLGPLUGIN_H__
-#define __GTCNOTIFDLGPLUGIN_H__
-
-
-// INCLUDES
-#include <eikdialg.h>
-#include <e32std.h>
-#include <e32base.h>
-#include <cdblen.h>
-#include <eiknotapi.h>
-#include <AknForm.h>
-#include <AknQueryDialog.h>
-#include <AknGlobalMsgQuery.h>
-#include <aknPopup.h>
-
-
-// CONSTANTS
-
-// UIDs for dialogs
-
-// ID of GTC username & password dialog
-const TUid KUidGtcDialog        = { 0x101f8e7f };
-
-// Channel used for screen   
-const TUid KScreenOutputChannel = { 0x00000123 };
-
-// Number of dialogs in this plugin
-const TInt KPluginGranularity   = 1;
-
-// ROM folder
-_LIT( KDriveZ, "z:" );
-
-// RSC file name.
-_LIT( KResourceFileName, "GtcNotifDlgUi.rsc" );
-
-
-// GLOBAL FUNCTIONS
-//
-
-/**
-* Array of connection dialog plugins.
-* @return A CArray of MEikSrvNotifierBase2 based classes.
-*/
-IMPORT_C CArrayPtr< MEikSrvNotifierBase2 >* NotifierArray();
-
-
-// CLASS DECLARATION
-
-class CGTCResponseQueryDialog;
-class CGTCMessageDisplayDialog;
-
-
-struct TEapGtcUsernamePasswordInfo
-    {
-    TBool iIsFirstQuery;
-    TBuf16<128> iIdentity;
-    TBuf16<256> iPasscode;
-    TPassword iPincode;
-    };
-
-
-/**
- * Gtc dialog plugin class
- */
-class CGtcDialogPlugin : public CBase,
-                         public MEikSrvNotifierBase2
-    {
-    public:
-        static CGtcDialogPlugin* NewL();
-
-        ~CGtcDialogPlugin();
-
-        TNotifierInfo RegisterL();
-        TNotifierInfo Info() const;
-
-        TPtrC8 StartL( const TDesC8& aBuffer );
-        void StartL( const TDesC8& aBuffer, TInt aReplySlot,
-                     const RMessagePtr2& aMessage );
-
-        TPtrC8 UpdateL( const TDesC8& aBuffer );
-        void Cancel();
-        void CompleteL( TInt aStatus );
-        void Release();
-        void CompleteMessageDisplayL( TInt aStatus );
-
-    protected:
-        CGtcDialogPlugin();
-
-        void ConstructL();
-        
-    protected:
-        TNotifierInfo iInfo;        // Notifier info
-        RMessagePtr2 iMessage;      // Message
-        TInt iReplySlot;            // Reply slot
-        TBool iCancelled;           // ETrue if dialog cancelled. For Query dialog.	    
-        TBool iGtcMessageCancelled; // ETrue if message dialog is cancelled.
-
-    private:
-        CGTCResponseQueryDialog* iGTCResponseQueryDlg;
-        CGTCMessageDisplayDialog* iGTCMessageDisplayDlg;
-
-        TEapGtcUsernamePasswordInfo* iDataPtr;
-        TPckg<TEapGtcUsernamePasswordInfo>* iDataPckgPtr;
-        TInt iResource;             // Resource
-    };
-
-
-#endif  // __GTCNOTIFDLGPLUGIN_H__
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/loc/gtcnotifdlg.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-GTC Notifier
-*
-*/
-
-/*
-* %version: %
-*/
-
-//  LOCALISATION STRINGS
-
-
-//d:Message in query used to send GTC output.
-//l:popup_query_code_window
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_gtc_notif_response     "EAP-GTC response:"
-
-
-//d:Title of the message query.
-//l:heading_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_gtc_notif_message      "EAP-GTC message:"
-
-
-//d:Username query string
-//l:popup_query_code_window
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_gtc_notif_username     "EAP-GTC user name:"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/src/GTCMessageDisplayDialog.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of Gtc Message Display Dialog.
-*
-*/
-
-/*
-* %version: tr1cfwln#13 %
-*/
-
-// INCLUDE FILES
-#include "GtcNotifDlgPlugin.h"
-#include "GTCMessageDisplayDialog.h"
-
-
-// -----------------------------------------------------------------------------
-// CGTCMessageDisplayDialog::CGTCMessageDisplayDialog
-// -----------------------------------------------------------------------------
-//
-CGTCMessageDisplayDialog::CGTCMessageDisplayDialog( CGtcDialogPlugin* aPlugin )
-: CAknMessageQueryDialog( ENoTone ), 
-  iPlugin( aPlugin )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGTCMessageDisplayDialog::~CGTCMessageDisplayDialog
-// -----------------------------------------------------------------------------
-//
-CGTCMessageDisplayDialog::~CGTCMessageDisplayDialog()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGTCMessageDisplayDialog::NewL
-// -----------------------------------------------------------------------------
-//
-CGTCMessageDisplayDialog* CGTCMessageDisplayDialog::NewL( const TDesC& aMessage, 
-                                                    CGtcDialogPlugin* aPlugin )
-    {
-    CGTCMessageDisplayDialog* self = new( ELeave ) CGTCMessageDisplayDialog( 
-                                                                    aPlugin );
-
-    CleanupStack::PushL( self );
-    if ( aMessage.Length() )
-        {
-        self->SetMessageTextL( aMessage );
-        }
-
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGTCMessageDisplayDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CGTCMessageDisplayDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( CAknMessageQueryDialog::OkToExitL( aButtonId ) )
-        {
-        if ( aButtonId == EAknSoftkeyOk )
-            {
-            iPlugin->CompleteMessageDisplayL( KErrNone );
-            }
-        else
-            {
-            // Some cancel.
-            iPlugin->CompleteMessageDisplayL( KErrCancel );
-            }
-
-        return( ETrue );
-        }
-
-    return( EFalse ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGTCMessageDisplayDialog::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CGTCMessageDisplayDialog::HandleResourceChange( TInt aType )
-    {
-    CAknMessageQueryDialog::HandleResourceChange( aType );
-    if ( aType == KAknsMessageSkinChange )
-        {
-        }
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/src/GTCResponseQueryDialog.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of Gtc Response Query Dialog.
-*
-*/
-
-/*
-* %version: tr1cfwln#11 %
-*/
-
-// INCLUDE FILES
-#include "GtcNotifDlgPlugin.h"
-#include "GTCResponseQueryDialog.h"
-
-
-// -----------------------------------------------------------------------------
-// CGTCResponseQueryDialog::CGTCResponseQueryDialog
-// -----------------------------------------------------------------------------
-//
-CGTCResponseQueryDialog::CGTCResponseQueryDialog( TDes& aResponse, 
-                                                  CGtcDialogPlugin* aPlugin )
-: CAknTextQueryDialog( aResponse ), 
-  iPlugin( aPlugin )
-    {    
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGTCResponseQueryDialog::~CGTCResponseQueryDialog
-// -----------------------------------------------------------------------------
-//
-CGTCResponseQueryDialog::~CGTCResponseQueryDialog()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGTCResponseQueryDialog::NewL
-// -----------------------------------------------------------------------------
-//
-CGTCResponseQueryDialog* CGTCResponseQueryDialog::NewL( TDes& aResponse, 
-                                                    CGtcDialogPlugin* aPlugin )
-    {
-    CGTCResponseQueryDialog* self = new( ELeave ) CGTCResponseQueryDialog( 
-                                                        aResponse, aPlugin );
-    return self;
-}
-
-
-// -----------------------------------------------------------------------------
-// CGTCResponseQueryDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CGTCResponseQueryDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( CAknTextQueryDialog::OkToExitL( aButtonId ) )
-       {
-        // This will be the case always since there is no "cancel" in this dialog.
-        if ( aButtonId==EAknSoftkeyOk )
-            {
-            iPlugin->CompleteL( KErrNone );
-            }
-        else
-            {
-            // Everything else is for cancel.
-            iPlugin->CompleteL( KErrCancel );
-            }
-
-        return( ETrue );
-        }
-
-    return( EFalse ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGTCResponseQueryDialog::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CGTCResponseQueryDialog::HandleResourceChange( TInt aType )
-    {
-    CAknTextQueryDialog::HandleResourceChange( aType );
-    if ( aType == KAknsMessageSkinChange )
-        {
-        }
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapGtc/NotifierUi/src/GtcNotifDlgPlugin.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,403 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of GtcNotif dialog plugin.
-*
-*/
-
-/*
-* %version: 12.1.9 %
-*/
-
-// INCLUDE FILES
-#include <coemain.h>
-#include <eikenv.h>
-#include <bautils.h>
-#include <data_caging_path_literals.hrh>
-#include <gtcnotifdlgui.rsg>
-#include <e32base.h>
-#include <StringLoader.h>
-
-#include <e32property.h>            // For RProperty 
-#include <UikonInternalPSKeys.h>    // For KPSUidUikon and KUikGlobalNotesAllowed.
-
-#include "GtcNotifDlgPlugin.h"
-#include "GTCResponseQueryDialog.h"
-#include "GTCMessageDisplayDialog.h"
-
-
-// CONSTANTS
-static const TInt KMaxLengthOfGtcResponse = 256;
-
-// Ratio between ascii and unicode character sizes
-static const TUint KAsciiUnicodeRatio = 2;
-
-
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-
-// -----------------------------------------------------------------------------
-// CreateNotifiersL
-// -----------------------------------------------------------------------------
-//
-LOCAL_C void CreateNotifiersL( 
-                          CArrayPtrFlat< MEikSrvNotifierBase2 >* aNotifiers )
-    {
-    MEikSrvNotifierBase2 *serNotify;
-
-    serNotify = CGtcDialogPlugin::NewL();
-    CleanupStack::PushL( serNotify );
-    aNotifiers->AppendL( serNotify );
-    CleanupStack::Pop( serNotify );
-    }
-
-
-// -----------------------------------------------------------------------------
-// NotifierArray
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CArrayPtr< MEikSrvNotifierBase2 >* NotifierArray()
-    {
-    // NotifierArray() can't leave
-    CArrayPtrFlat< MEikSrvNotifierBase2 >* array = 
-            new CArrayPtrFlat< MEikSrvNotifierBase2 >( KPluginGranularity );
-
-    if ( array )
-        {
-        TRAPD( err, CreateNotifiersL( array ) );
-        
-        if( err )
-            {
-            TInt count = array->Count();
-
-            while( count-- )
-                {
-                ( *array )[ count ]->Release();
-                }
-
-            delete array;
-            array = NULL;
-            }
-        }
-
-    return( array );
-    }
-
-
-//////////////////////////////////////////////////////////////
-// Gtc dialog plugin
-/////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::CGtcDialogPlugin
-// -----------------------------------------------------------------------------
-//
-CGtcDialogPlugin::CGtcDialogPlugin()
-: iCancelled( EFalse ), 
-  iGtcMessageCancelled( EFalse )
-    {
-    iManager = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::~CGtcDialogPlugin
-// -----------------------------------------------------------------------------
-//
-CGtcDialogPlugin::~CGtcDialogPlugin()
-    {
-    CCoeEnv::Static()->DeleteResourceFile( iResource );
-
-    if ( !iGtcMessageCancelled )
-        {
-        delete iGTCMessageDisplayDlg;
-        }
-
-    if ( !iCancelled )
-        {
-        delete iGTCResponseQueryDlg;
-        }
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::RegisterL
-// -----------------------------------------------------------------------------
-//
-CGtcDialogPlugin::TNotifierInfo CGtcDialogPlugin::RegisterL()
-    {
-    iInfo.iUid      = KUidGtcDialog;
-    iInfo.iPriority = ENotifierPriorityHigh;
-    iInfo.iChannel  = KUidGtcDialog;
-    return iInfo;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::NewL
-// -----------------------------------------------------------------------------
-//
-CGtcDialogPlugin* CGtcDialogPlugin::NewL()
-    {
-    CGtcDialogPlugin* self = new ( ELeave ) CGtcDialogPlugin();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CGtcDialogPlugin::ConstructL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    BaflUtils::NearestLanguageFile( CCoeEnv::Static()->FsSession(), fileName );
-    iResource = CCoeEnv::Static()->AddResourceFileL( fileName );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::StartL
-// -----------------------------------------------------------------------------
-//
-TPtrC8 CGtcDialogPlugin::StartL( const TDesC8& /*aBuffer*/ )
-    {
-    return KNullDesC8().Ptr();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::StartL
-// -----------------------------------------------------------------------------
-//
-void CGtcDialogPlugin::StartL( const TDesC8&  aBuffer, 
-                               TInt aReplySlot, 
-                               const RMessagePtr2& aMessage )
-    {
-    iCancelled = EFalse;
-    iReplySlot = aReplySlot;
-    iMessage   = aMessage;
-     
-    // This object gets constructed only once where as this gets called many 
-    // times, if user is not answering the query. 
-    // So initialize everything here itself.
-    iGTCResponseQueryDlg = NULL;
-    iGTCMessageDisplayDlg = NULL;
-    iDataPtr = NULL;
-    iDataPckgPtr = NULL;
-    iGtcMessageCancelled = EFalse;
-
-    // We are about to display the password prompt.
-    // Since this part of the code can be executed during the bootup, check if
-    // the UI has really started up to display notes/dialogs.
-    TInt notesAllowed = 0;
-    TInt error = RProperty::Get( KPSUidUikon, KUikGlobalNotesAllowed, 
-                                 notesAllowed );
-
-    // The above call can return error. Don't care the error. What we care is
-    // if notesAllowed has turned to 1 from 0.
-    if ( notesAllowed )
-        {
-        // Display EAP-GTC message if there's one...
-        if ( aBuffer.Length() != 0 )
-            {
-            HBufC16* buffer = HBufC16::NewLC( aBuffer.Size() /
-                                                        KAsciiUnicodeRatio );
-            TPtr16 text = buffer->Des();
-            text.Copy( reinterpret_cast<TUint16 *>( const_cast<TUint8 *> (
-                                        aBuffer.Ptr() ) ), aBuffer.Size() /
-                                                        KAsciiUnicodeRatio );
-
-            iGTCMessageDisplayDlg = CGTCMessageDisplayDialog::NewL( text, 
-                                                                    this );
-            iGTCMessageDisplayDlg->ExecuteLD( R_MESSAGE_QUERY );
-
-            // Do not set iGTCMessageDisplayDlg to NULL here, because then
-            // a timeout cancel will cause a crash. Prevent double deletion
-            // by checking iGtcMessageCancelled in the destructor.
-
-            CleanupStack::PopAndDestroy( buffer );
-            }
-        else
-            {
-            // Show the data query directly since there is no message to display.
-            CompleteMessageDisplayL( KErrNone );
-            }
-        }
-
-    // In case if the notes are not allowed, this message gets completed when 
-    // EAPOL time out occurs and a subsequent call to cancel from 
-    // eap_am_type_securid_symbian_c::DoCancel().
-
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::UpdateL
-// -----------------------------------------------------------------------------
-//
-TPtrC8 CGtcDialogPlugin::UpdateL( const TDesC8& /*aBuffer*/ )
-    {
-    return KNullDesC8().Ptr();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::Cancel
-// -----------------------------------------------------------------------------
-//
-void CGtcDialogPlugin::Cancel()
-    {
-    if ( !iCancelled )
-        {
-        iCancelled = ETrue;
-
-        if ( !iMessage.IsNull() )
-            {
-            iMessage.Complete( KErrCancel );
-            }
-
-        if ( iGTCResponseQueryDlg )
-            {
-            delete iGTCResponseQueryDlg;
-            iGTCResponseQueryDlg = NULL;
-            }
-
-        if ( !iGtcMessageCancelled && iGTCMessageDisplayDlg )
-            {
-            iGtcMessageCancelled = ETrue;
-            delete iGTCMessageDisplayDlg;
-            iGTCMessageDisplayDlg = NULL;
-            }
-        }
-
-    if( iDataPtr ) 
-        {
-        delete iDataPtr;
-        iDataPtr = NULL;
-        }
-
-    if( iDataPckgPtr ) 
-        {
-        delete iDataPckgPtr;
-        iDataPckgPtr = NULL;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::CompleteL
-// -----------------------------------------------------------------------------
-//
-void CGtcDialogPlugin::CompleteL( TInt aStatus )
-    { 
-    if ( aStatus == KErrNone  && !iMessage.IsNull() )
-        {
-        iMessage.WriteL( iReplySlot, *iDataPckgPtr);
-        }
-
-    iCancelled = ETrue;
-    
-    if ( !iMessage.IsNull() )
-        {
-        iMessage.Complete( aStatus );
-        }
-
-    if( iDataPtr ) 
-        {
-        delete iDataPtr;
-        iDataPtr = NULL;
-    }
-
-    if( iDataPckgPtr ) 
-        {
-        delete iDataPckgPtr;
-        iDataPckgPtr = NULL;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::Release
-// -----------------------------------------------------------------------------
-//
-void CGtcDialogPlugin::Release()
-    {
-    delete this;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::Info
-// -----------------------------------------------------------------------------
-//
-CGtcDialogPlugin::TNotifierInfo CGtcDialogPlugin::Info() const
-    {
-    return iInfo;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CGtcDialogPlugin::CompleteMessageDisplayL
-// -----------------------------------------------------------------------------
-//
-void CGtcDialogPlugin::CompleteMessageDisplayL( TInt aStatus )
-    {
-    iGtcMessageCancelled = ETrue;
-
-    if ( aStatus == KErrNone )
-        {
-        // Now user has acknowledged the GTC message.
-        // Show the response query to enter the password.
-
-        iDataPtr = new( ELeave ) TEapGtcUsernamePasswordInfo;
-        iDataPckgPtr = new( ELeave ) TPckg<TEapGtcUsernamePasswordInfo>( 
-                                                                *iDataPtr );
-
-        TBuf16<KMaxLengthOfGtcResponse> response;
-
-        iGTCResponseQueryDlg = CGTCResponseQueryDialog::NewL( 
-                                                iDataPtr->iPasscode, this );
-
-        HBufC* text = StringLoader::LoadLC( R_GTC_RESPONSE );
-        iGTCResponseQueryDlg->SetPromptL( *text );
-        CleanupStack::PopAndDestroy( text );
-
-        iGTCResponseQueryDlg->ExecuteLD( R_GTC_PASSWORD_QUERY);
-
-        // Do not set iGTCResponseQueryDlg to NULL here, because then
-        // a timeout cancel will cause a crash. Prevent double deletion
-        // by checking iCancelled in the destructor.
-        }
-    else
-        {
-        // User probably cancelled the message, some how.
-        // Can not continue to show the password query.
-        if ( !iMessage.IsNull() )
-            {
-            iMessage.Complete( aStatus );
-            }
-        }
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/data/EapMschapv2Ui.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP MsChapv2 UI resource file
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-CHARACTER_SET   UTF8
-
-//  RESOURCE IDENTIFIER
-NAME EPLM
-
-
-//  INCLUDES
-#include <eikon.rh>
-#include "EapMschapv2Ui.hrh"   // Enums for these resources
-#include <eapmschapv2ui.loc>   // Localisation file
-#include <wlaneapsettingsui.loc>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-
-//  CONSTANTS  
-#define KUsernameMaxNameLength 255
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF16 { buf = ""; }
-
-RESOURCE CBA r_mschap_ui_softkeys_options_back_edit
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EMschapv2UiCmdChange; txt = qtn_msk_change; }
-        };
-    }
-
-RESOURCE DIALOG r_mschapv2_setting_dialog
-    {
-    flags = EAknDialogSelectionList | EEikDialogFlagWait;
-    buttons = r_mschap_ui_softkeys_options_back_edit;
-    items = 
-        { 
-        DLG_LINE
-            {
-            id = EMschapv2SettingsListBox;
-            type = EAknCtSettingListBox;
-            control = LISTBOX 
-                {
-                flags = EAknListBoxMenuList;
-                };
-            }
-        }; 
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_mschapv2_username_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_mschapv2_setting_edwin;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_mschapv2_password_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_password;
-    type = EEikCtSecretEd;
-    editor_resource_id = r_mschapv2_setting_password;
-    }
-
-
-RESOURCE SECRETED r_mschapv2_setting_password 
-    {
-    num_letters = KUsernameMaxNameLength;
-    }
-
-
-RESOURCE EDWIN r_mschapv2_setting_edwin 
-    {
-    width = 9;
-    lines = 5;
-    maxlength=KUsernameMaxNameLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    flags = EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    }
-
-
-RESOURCE MENU_BAR r_mschapv2_menubar
-    {
-    titles =
-        {
-        MENU_TITLE { menu_pane = r_mschapv2_menu_pane; txt = ""; }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_mschapv2_menu_pane
-    {
-    items =
-        {
-        MENU_ITEM 
-            { 
-            command = EMschapv2UiCmdChange;  
-            txt = qtn_options_change; 
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt = qtn_options_help; 
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdExit;
-            txt = qtn_options_exit; 
-            }
-        };
-    }
-
-
-// Resource strings
-RESOURCE TBUF r_mschapv2_settings_title       { buf = qtn_wlan_eap_mschapv2_title; }
-RESOURCE TBUF r_plain_mschapv2_settings_title { buf = qtn_wlan_eap_plain_mschapv2_title; }
-RESOURCE TBUF r_mschapv2_username_string      { buf = qtn_wlan_eap_sett_username; }
-RESOURCE TBUF r_mschapv2_passprompt_string    { buf = qtn_wlan_eap_sett_passprompt; }
-RESOURCE TBUF r_mschapv2_password_string      { buf = qtn_wlan_eap_sett_password; }
-RESOURCE TBUF r_mschapv2_passprompt_on        { buf = qtn_wlan_eap_sett_passprompt_on; }
-RESOURCE TBUF r_mschapv2_passprompt_off       { buf = qtn_wlan_eap_sett_passprompt_off; }
-
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_mschapv2_yesno_texts
-    {
-    setting_texts_resource = r_mschapv2_yes_no_texts_resource;
-    popped_up_texts_resource = r_mschapv2_yes_no_array;
-    }
-
-
-RESOURCE ARRAY r_mschapv2_yes_no_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_passprompt_off; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_passprompt_on; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_mschapv2_yes_no_array
-    {
-    items=
-        {
-        LBUF { txt = qtn_wlan_eap_sett_passprompt_off; },
-        LBUF { txt = qtn_wlan_eap_sett_passprompt_on; }
-        };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_mschapv2_display_yesno_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_passprompt;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_mschapv2_setting_enumerated_popup;
-    }
-
-
-RESOURCE POPUP_SETTING_LIST r_mschapv2_setting_enumerated_popup
-    {
-    flags = EAknPopupSettingListFlagInitialised;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/inc/EapMschapv2Ui.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP Mschapv2 UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _EAPMSCHAPV2UI_HRH_
-#define _EAPMSCHAPV2UI_HRH_
-
-enum TEAPMschapv2UIMenuCommands
-    {
-    EMschapv2UiCmdUndefined = 6000,
-    EMschapv2UiCmdChange
-    };
-
-enum TEAPMschapv2UINotes
-    {
-    EEAPMschapv2UIGeneralError = 6100
-    };
-
-enum TEapMschapv2IiLines
-	{
-	EMschapv2SettingsListBox = 6200
-	};
-
-enum TEapMschapv2SettingIds
-	{
-	EMschapv2SettingUsernameSettingId=6300,
-	EMschapv2SettingPassPromptSettingId,
-	EMschapv2SettingPasswordSettingId
-	};
-
-enum TEapMschapv2SettingItemId
-	{
-	EMschapv2SettingPageUserName=6400,
-	EMschapv2SettingPagePasswordPrompt,
-	EMschapv2SettingPagePassword
-	};
-
-
-#endif  //_EAPMSCHAPV2UI_HRH_
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/inc/EapMschapv2UiSettingArray.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP MsChapv2 UI settings array
-*
-*/
-
-/*
-* %version: 12 %
-*/
-
-#ifndef _EAPMSCHAPV2UISETTINGARRAY_H_
-#define _EAPMSCHAPV2UISETTINGARRAY_H_
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-#include "EapMschapv2Ui.hrh"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CEapMsChapV2SettingItemArray : public CBase
-    {
-    public:
-        static CEapMsChapV2SettingItemArray* NewL();
-
-        virtual ~CEapMsChapV2SettingItemArray();
-
-        CAknSettingItem* Item( TEapMschapv2SettingItemId aItem );
-
-        CAknSettingItemArray* Array();
-
-        void StoreSettingsL();
-
-        void AddTextItemL( TDes& aBuffer, TInt aId, TInt aTitleResource,
-                           TInt aSettingPageResource, TInt aAssociatedResource,
-                           TInt aOrdinal);
-
-        void AddPasswordItemL( TDes& aPassword, TInt aId, TInt aTitleResource,
-                               TInt aSettingPageResource, 
-                               TInt aAssociatedResource, TInt aOrdinal);
-
-        void AddBinarySettingItemL( TInt aSettingPageResourceId,
-                                    TInt aTitleResourceId,
-                                    TInt aAssociatedResourceId,
-                                    TInt aOrdinal,
-                                    TBool& aModifiedValue);
-
-    protected:
-        CEapMsChapV2SettingItemArray();
-        void ConstructL();
-
-    private:
-        CAknSettingItemArray* iArray;
-    };
-
-#endif  // _EAPMSCHAPV2UISETTINGARRAY_H_
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/inc/EapMschapv2UiView.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP MsChapv2 UI setting dialog
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-#ifndef _EAPMSCHAPV2UIVIEW_H_
-#define _EAPMSCHAPV2UIVIEW_H_
-
-// INCLUDES
-#include <AknDialog.h>        
-#include <eikspane.h> 
-#include <akntitle.h>
-#include <aknsettingitemlist.h>
-#include <aknnavi.h>
-#include <eiklbo.h>
-#include "EapMschapv2Ui.hrh"
-
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CSettingsListBoxItemDrawer;
-class CEapMsChapV2SettingItemArray;
-class CEapMsChapV2UiConnection;
-class CEapMsChapV2UiMsChapV2Data;
-class CEapMsChapV2UiDataConnection;
-
-
-// CLASS DECLARATION
-
-/**
-*  Settings dialog class definition
-*/
-class CEapMsChapV2UiDialog : public CAknDialog,
-                             public MEikListBoxObserver
-    {
-    public:
-        CEapMsChapV2UiDialog( CEapMsChapV2UiConnection* aConnection, 
-                              TInt& aButtonId );
-
-        ~CEapMsChapV2UiDialog();
-     
-        /**
-        * Create and launch dialog.
-        * @param aResourceId The resource ID of the dialog to load.
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( TInt aResourceId );
-        
-        
-    public: // From MEikListBoxObserver
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );                
-
-
-    protected:
-        void PreLayoutDynInitL();
-        TBool OkToExitL( TInt aButtonId );
-
-    private:
-        void InitializeSettingsL();
-        void DrawSettingsListL();
-        void ChangeTitleL( TBool aIsStarted );
-        void ShowSettingPageL( TInt aCalledFromMenu ); 
-        void ProcessCommandL( TInt aCommand );
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-
-    private:
-        CEapMsChapV2UiConnection* iConnection;
-        CEapMsChapV2UiMsChapV2Data* iUiData;
-        CEapMsChapV2UiDataConnection* iDataConnection;
-        CEapMsChapV2SettingItemArray* iSettingArray;
-        CAknSettingStyleListBox* iSettingListBox;
-        CSettingsListBoxItemDrawer* iSettingListItemDrawer;
-        TBool iPassPrompt;
-        CAknNavigationControlContainer* iNaviPane;
-        CAknNavigationDecorator* iNaviDecorator;
-        HBufC* iPreviousText;            
-        TInt* iButtonId;
-        
-        // Tells the status of UI construction. TRUE if UI construction is completed.
-		TBool iIsUIConstructionCompleted;
-    };
-
-
-#endif //_EAPMSCHAPV2UIVIEW_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/loc/eapmschapv2ui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-MsChapV2 authentication settings
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:UI title for main view (EAP-MSCHAPv2)
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_mschapv2_title         "EAP-MSCHAPv2 settings"
-
-//d:UI title for main view (MSCHAPv2)
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_plain_mschapv2_title   "MSCHAPv2 settings"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2Ui.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP MsChapv2 UI class
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-// INCLUDE FILES
-#include "EapMschapv2Ui.h"
-#include <EapMsChapV2UiConnection.h>
-#include "EapMschapv2UiView.h"
-#include <eapmschapv2ui.rsg>
-#include <bautils.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "eapmschapv2ui.rsc" );
-
-
-// CLASS DECLARATION
-class TResourceFileCleanupItem
-    {
-    public:
-        CCoeEnv* iCoeEnv;
-        TInt iResourceFileOffset;
-    }; 
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupResourceFile
-// -----------------------------------------------------------------------------
-//
-static void CleanupResourceFile( TAny* aObject )
-    {
-    TResourceFileCleanupItem* item = 
-                        REINTERPRET_CAST( TResourceFileCleanupItem*, aObject );
-    item->iCoeEnv->DeleteResourceFile( item->iResourceFileOffset );
-    delete item;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2Ui::CEapMsChapV2Ui
-// -----------------------------------------------------------------------------
-//
-CEapMsChapV2Ui::CEapMsChapV2Ui( CEapMsChapV2UiConnection* aConnection ) 
-: iConnection( aConnection )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2Ui::NewL
-// -----------------------------------------------------------------------------
-//
-CEapMsChapV2Ui* CEapMsChapV2Ui::NewL( CEapMsChapV2UiConnection* aConnection )
-    {
-    CEapMsChapV2Ui* self = new ( ELeave ) CEapMsChapV2Ui( aConnection );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );    
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2Ui::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2Ui::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2Ui::~CEapMsChapV2Ui
-// -----------------------------------------------------------------------------
-//
-CEapMsChapV2Ui::~CEapMsChapV2Ui()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2Ui::InvokeUiL
-// -----------------------------------------------------------------------------
-//
-TInt CEapMsChapV2Ui::InvokeUiL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    CCoeEnv* coeEnv = CCoeEnv::Static();
-    BaflUtils::NearestLanguageFile( coeEnv->FsSession(), fileName );
-
-    TResourceFileCleanupItem* item = new( ELeave ) TResourceFileCleanupItem;
-
-    item->iCoeEnv = coeEnv;
-    CleanupStack::PushL( TCleanupItem( CleanupResourceFile, item ) );
-    item->iResourceFileOffset = coeEnv->AddResourceFileL( fileName );
-
-    TInt buttonId;
-    CEapMsChapV2UiDialog* settingsDlg = new( ELeave ) CEapMsChapV2UiDialog(
-                                                    iConnection, buttonId );
-    settingsDlg->ConstructAndRunLD( R_MSCHAPV2_SETTING_DIALOG );
-
-    CleanupStack::PopAndDestroy();  // For resource file
-
-    return buttonId;
-    }
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2UiSettingArray.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP MsChapv2 UI settings array
-*
-*/
-
-/*
-* %version: 14 %
-*/
-
-// INCLUDE FILES
-#include "EapMschapv2UiSettingArray.h"
-#include "EapMschapv2Ui.hrh"
-#include <aknsettingitemlist.h>
-#include <akntextsettingpage.h>
-
-// CONSTANTS
-
-// String representing an empty password field on the UI
-_LIT( KEmptyPassword, "****" );
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::CEapMsChapV2SettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapMsChapV2SettingItemArray::CEapMsChapV2SettingItemArray()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::NewL
-// -----------------------------------------------------------------------------
-//
-CEapMsChapV2SettingItemArray* CEapMsChapV2SettingItemArray::NewL() 
-    {
-    CEapMsChapV2SettingItemArray* self = 
-                                new( ELeave ) CEapMsChapV2SettingItemArray();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); 
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2SettingItemArray::ConstructL() 
-    {
-    iArray = new( ELeave ) CAknSettingItemArray( 2, EFalse, 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::~CEapMsChapV2SettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapMsChapV2SettingItemArray::~CEapMsChapV2SettingItemArray()
-    {
-    if( iArray ) 
-        {
-        // ResetAndDestroy()
-        iArray->ResetAndDestroy();
-        }    
-    delete iArray;   
-    iArray = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::Item
-// -----------------------------------------------------------------------------
-//
-CAknSettingItem* CEapMsChapV2SettingItemArray::Item( 
-                                                TEapMschapv2SettingItemId aId )
-    {
-    for( TInt i = 0; i < iArray->Count(); i++ )
-    {
-    if( iArray->At( i )->Identifier() == aId )
-        {
-        return iArray->At( i );
-        }
-    }
-    __ASSERT_DEBUG( EFalse, User::Invariant() );
-
-    return NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::Array
-// -----------------------------------------------------------------------------
-//
-CAknSettingItemArray* CEapMsChapV2SettingItemArray::Array()
-    {
-    return iArray;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::StoreSettingsL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2SettingItemArray::StoreSettingsL()
-    {
-    // Do what SettingItemList::StoreSettings would do. 
-    for( TInt i( 0 ); i < iArray->Count(); ++i )
-        {
-        iArray->At( i )->StoreL();
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::AddTextItemL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2SettingItemArray::AddTextItemL( TDes& aBuffer, 
-                                                 TInt aId, 
-                                                 TInt aTitleResource, 
-                                                 TInt aSettingPageResource,
-                                                 TInt aAssociatedResource, 
-                                                 TInt aOrdinal)
-    {
-    // Create new setting item
-    CAknSettingItem* settingItem = 
-                            new( ELeave ) CAknTextSettingItem( aId,  aBuffer );
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KNullDesC );
-    settingItem->SetSettingPageFlags( 
-                                    CAknTextSettingPage::EZeroLengthAllowed );
-    
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResource );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    
-    CleanupStack::PopAndDestroy( itemTitle );
-
-    // Items are destroyed in destructor when resetting array
-    CleanupStack::Pop( settingItem ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::AddPasswordItemL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2SettingItemArray::AddPasswordItemL( TDes& aPassword, 
-                                                     TInt aId, 
-                                                     TInt aTitleResource, 
-                                                     TInt aSettingPageResource,
-                                                     TInt aAssociatedResource, 
-                                                     TInt aOrdinal)
-    {
-    // Create new setting item
-    CAknSettingItem* settingItem = new ( ELeave ) CAknPasswordSettingItem( aId,
-                                            CAknPasswordSettingItem::EAlpha,
-                                            aPassword );
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KEmptyPassword );
-    
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResource );
-   
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }     
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2SettingItemArray::AddBinarySettingItemL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2SettingItemArray::AddBinarySettingItemL( 
-                                                TInt aSettingPageResourceId,
-                                                TInt aTitleResourceId, 
-                                                TInt aAssociatedResourceId,
-                                                TInt aOrdinal, 
-                                                TBool& aModifiedValue )
-    {
-    CAknSettingItem* settingItem = 
-                new( ELeave ) CAknBinaryPopupSettingItem( 0, aModifiedValue );
-    CleanupStack::PushL( settingItem );
-
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResourceId );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResourceId, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResourceId );
-    iArray->AppendL( settingItem );
-
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/ConfigUi/src/EapMschapv2UiView.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,510 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP Mschapv2 UI settings dialog
-*
-*/
-
-/*
-* %version: 30 %
-*/
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include "EapMschapv2UiView.h"
-#include "EapMschapv2Ui.hrh"
-#include <eapmschapv2ui.rsg>
-#include <akntextsettingpage.h>
-#include <aknsettingitemlist.h>
-#include "EapMschapv2UiSettingArray.h"
-#include <aknnavide.h>
-#include <aknnotewrappers.h> 
-#include <EapMsChapV2UiConnection.h>
-#include <EapMsChapV2UiDataConnection.h>
-#include <EapMsChapV2UiMsChapV2Data.h>
-
-#include <featmgr.h>
-#include <hlplch.h>
-
-
-// CONSTANTS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
-
-_LIT( KEmptyString, "" );
-
-static const TInt KEapMsChapv2Id = 26;
-
-// MODULE DATA STRUCTURES
-enum 
-    {
-    EUsernameItem=0,
-    EPasswordPromptItem,
-    EPasswordItem
-    };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::CEapMsChapV2UiDialog
-// -----------------------------------------------------------------------------
-//
-CEapMsChapV2UiDialog::CEapMsChapV2UiDialog( 
-                                        CEapMsChapV2UiConnection* aConnection,
-								        TInt& aButtonId )
-: CAknDialog(),
-  iConnection( aConnection ),
-  iUiData( 0 ), 
-  iDataConnection( 0 ), 
-  iSettingArray( 0 ), 
-  iSettingListBox( 0 ), 
-  iSettingListItemDrawer( 0 ), 
-  iPassPrompt( EFalse ),
-  iNaviPane( 0 ), 
-  iNaviDecorator( 0 ), 
-  iPreviousText( 0 ), 
-  iButtonId( &aButtonId ),
-  iIsUIConstructionCompleted( EFalse )
-    {
-    }
-
-
-// --------------------------------------------------z-------
-// CEapMsChapV2UiDialog::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CEapMsChapV2UiDialog::ConstructAndRunLD( TInt aResourceId )
-    {
-    CleanupStack::PushL( this );
-
-    iSettingArray = CEapMsChapV2SettingItemArray::NewL();
-
-    User::LeaveIfError( iConnection->Connect() );
-
-    iDataConnection = iConnection->GetDataConnection();
-    if ( iDataConnection == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-
-    User::LeaveIfError( iDataConnection->Open() );
-    User::LeaveIfError( iDataConnection->GetData( &iUiData ) );
-
-    FeatureManager::InitializeLibL();
-
-    ConstructL( R_MSCHAPV2_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-    
-    return CAknDialog::ExecuteLD( aResourceId );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::~CEapMsChapV2UiDialog
-// -----------------------------------------------------------------------------
-//
-CEapMsChapV2UiDialog::~CEapMsChapV2UiDialog()
-    {
-    if ( iNaviDecorator )
-        {
-        delete iNaviDecorator;
-        iNaviDecorator = NULL;
-        }
-
-    if ( iSettingArray )
-        {
-        iSettingArray->Array()->ResetAndDestroy();
-        delete iSettingArray;
-        }
-
-    if ( iSettingListBox )
-        {
-        iSettingListBox = 0;
-        }
-
-    if ( iSettingListItemDrawer )
-        {
-        iSettingListItemDrawer = 0;
-        }
-
-    if ( iDataConnection )
-        {
-        iDataConnection->Close();
-        delete iDataConnection;
-        }
-
-    if ( iConnection )
-        {
-        iConnection->Close();
-        }
-
-    delete iPreviousText;
-    
-    FeatureManager::UnInitializeLib();
-    }
-
-
-// ---------------------------------------------------------
-// CEapMsChapV2UiDialog::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CEapMsChapV2UiDialog::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                   TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            OkToExitL( EMschapv2UiCmdChange );         
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }    
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2UiDialog::PreLayoutDynInitL()
-    {
-    ChangeTitleL( ETrue );
-    
-    TUid naviPaneUid;
-    naviPaneUid.iUid = EEikStatusPaneUidNavi;
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( naviPaneUid );
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>( 
-                                        statusPane->ControlL(naviPaneUid) );
-        // Set empty text to hide tabs.
-        iNaviDecorator = iNaviPane->CreateNavigationLabelL( KEmptyString );
-        iNaviPane->PushL( *iNaviDecorator );
-        }            
-            
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>(
-                                    ControlOrNull( EMschapv2SettingsListBox) );
-    iSettingListItemDrawer = static_cast<CSettingsListBoxItemDrawer*>( 
-                                    iSettingListBox->ItemDrawer() ); 
-
-    iSettingListBox->SetMopParent( this );
-    iSettingListBox->CreateScrollBarFrameL( ETrue );
-    iSettingListBox->ScrollBarFrame()->SetScrollBarVisibilityL(
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iSettingListBox->SetListBoxObserver( this );                                                                                                
-    DrawSettingsListL();
-    
-    iIsUIConstructionCompleted = ETrue;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::ShowSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2UiDialog::ShowSettingPageL( TInt aCalledFromMenu ) 
-    {
-    TInt index = iSettingListBox->CurrentItemIndex();
-
-    CAknSettingItem* item = iSettingArray->Array()->At( index );
-    item->EditItemL( aCalledFromMenu );
-    item->StoreL();
-
-    if ( index == EPasswordPromptItem )
-        {
-        if ( !iPassPrompt )
-            *iUiData->GetPasswordPrompt() = EFalse;
-        else
-            *iUiData->GetPasswordPrompt() = ETrue;
-        }
-
-    DrawNow();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CEapMsChapV2UiDialog::OkToExitL( TInt aButtonId )
-    {
-    TBool ret( EFalse );
-    switch ( aButtonId )
-        {
-        case EEikBidOk:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                if ( iSettingListBox->IsFocused() )
-                    {
-                    ShowSettingPageL( EFalse );
-                    }
-                }
-            else
-                {
-                #if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapMsChapV2UiDialog::OkToExitL - UI not ready - Ignoring key press.\n") );
-				#endif
-                }
-            break;
-            }
-
-        case EAknSoftkeyOptions:
-            {
-            DisplayMenuL();
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                iDataConnection->Update();
-                ChangeTitleL( EFalse );
-                ret = ETrue;
-                }
-            break;
-            }
-        
-        case EMschapv2UiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-				{
-    			ShowSettingPageL( EFalse );
-				}
-			else
-			    {
-				#if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapMsChapV2UiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-				#endif						
-			    }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-
-    if ( ret )
-        {
-        *iButtonId = aButtonId;
-        }
-
-    return ret;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::DrawSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2UiDialog::DrawSettingsListL()
-    {  
-    iSettingArray->Array()->ResetAndDestroy();
-
-    TInt ordinal = 0;
-    iSettingArray->AddTextItemL( iUiData->GetUsername(), 
-                                EMschapv2SettingPageUserName,
-                                R_MSCHAPV2_USERNAME_STRING,
-                                R_MSCHAPV2_USERNAME_PAGE,
-                                NULL,
-                                ordinal++ );
-    
-    if ( *iUiData->GetPasswordPrompt() )
-        {
-        iPassPrompt = ETrue;
-        }
-    else{
-        iPassPrompt = EFalse;
-        }
-
-    iSettingArray->AddBinarySettingItemL( R_MSCHAPV2_DISPLAY_YESNO_PAGE,
-                                          R_MSCHAPV2_PASSPROMPT_STRING, 
-                                          R_MSCHAPV2_YESNO_TEXTS,
-                                          ordinal++,
-                                          iPassPrompt );    
-
-    iSettingArray->AddPasswordItemL( iUiData->GetPassword(), 
-                                     EMschapv2SettingPagePassword,
-                                     R_MSCHAPV2_PASSWORD_STRING,
-                                     R_MSCHAPV2_PASSWORD_PAGE,
-                                     NULL,
-                                     ordinal++ );
-
-
-    iSettingListBox->Model()->SetItemTextArray( iSettingArray->Array() );    
-    iSettingListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iSettingArray->Array()->RecalculateVisibleIndicesL();
-    iSettingListBox->HandleItemAdditionL();
-    iSettingListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::ChangeTitleL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2UiDialog::ChangeTitleL( TBool aIsStarted )
-    {
-    TUid titlePaneUid;
-    titlePaneUid.iUid = EEikStatusPaneUidTitle;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( titlePaneUid );
-    
-    if ( subPane.IsPresent() && subPane.IsAppOwned())
-        {
-        CAknTitlePane* titlePane = static_cast<CAknTitlePane*>( 
-                                        statusPane->ControlL( titlePaneUid ) );
-        if ( aIsStarted )
-            { 
-            // Store previous application title text
-            const TDesC* prevText = titlePane->Text();    
-
-            iPreviousText = HBufC::NewL( prevText->Length() );
-            iPreviousText->Des().Append( *prevText );
-
-            // EAGN-6QZD6U
-            // Loadd different titles for plain MSCHAPv2 and EAP-MSCHAPv2
-            TDesC* titleText;
-            if( iConnection->GetBearerEAPType() == KEapMsChapv2Id )
-                {
-                titleText = iEikonEnv->AllocReadResourceLC( 
-                                                R_MSCHAPV2_SETTINGS_TITLE );
-                }
-            else
-                {
-                titleText = iEikonEnv->AllocReadResourceLC( 
-                                                R_PLAIN_MSCHAPV2_SETTINGS_TITLE );
-                }
-            titlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText ); 
-            }
-        else
-            {
-            // Set calling application title text back
-            titlePane->SetTextL( *iPreviousText );    
-            // pop navidecorator when exiting
-            iNaviPane->Pop( iNaviDecorator );    
-            }    
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2UiDialog::DynInitMenuPaneL( TInt aResourceId, 
-                                             CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aResourceId == R_MSCHAPV2_MENU_PANE )
-        {
-        if ( aMenuPane && !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2UiDialog::ProcessCommandL( TInt aCommand )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    switch( aCommand )
-        {
-        case EAknCmdExit:
-            {
-            TryExitL( aCommand );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case EMschapv2UiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-				{
-    			ShowSettingPageL( ETrue );
-				}
-			else
-			    {
-				#if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapMsChapV2UiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-				#endif						
-			    }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapMsChapV2UiDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CEapMsChapV2UiDialog::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-    
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/data/MsChapv2NotifDlgUi.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Resource file of MsChapv2Notif.
-*
-*/
-
-/*
-* %version: 15 %
-*/
-
-// RESOURCE IDENTIFIER
-NAME MSCN
-
-
-// INCLUDES
-#include <eikon.rh>
-#include <eikon.rsg>
-
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <apsettings.mbg>
-
-#include <avkon.hrh>
-
-#include <mschapv2notifdlg.loc>
-
-
-// RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE DIALOG r_mschapv2notif_username_password_query
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar | 
-            EEikDialogFlagCbaButtons|EEikDialogFlagNotifyEsc;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtMultilineQuery;
-            id = EMultilineFirstLine;
-            control = AVERELL_DATA_QUERY
-                { 
-                layout = EMultiDataFirstEdwin;
-                label = qtn_wlan_eap_mschapv2_notif_username;
-                control = EDWIN
-                    {
-                    flags = 0;
-                    width = 5;
-                    lines = 1;
-                    maxlength = 255;
-                    default_case = EAknEditorLowerCase;
-                    allowed_case_modes = EAknEditorAllCaseModes;
-                    allowed_input_modes = EAknEditorAlphaInputMode | 
-                                          EAknEditorNumericInputMode |
-                                          EAknEditorPredictiveInputMode;
-                    default_input_mode = EAknEditorPredictiveInputMode;
-                    };
-                };
-            },
-
-        DLG_LINE
-            {
-            type = EAknCtMultilineQuery;
-            id = EMultilineSecondLine;
-            control = AVERELL_DATA_QUERY 
-                { 
-                layout = EMultiDataSecondSecEd;
-                label = qtn_wlan_eap_mschapv2_notif_password;
-                control = SECRETED
-                    {
-                    num_letters=255;
-                    };
-                };
-            }
-        };
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/inc/MsChapv2NotifDialog.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of dialog class of MsChapv2NotifDialog.
-*
-*/
-
-/*
-* %version: 15 %
-*/
-
-#ifndef __MSCHAPV2DIALOG_H__
-#define __MSCHAPV2DIALOG_H__
-
-// INCLUDES
-#include <eikdialg.h>
-#include <badesca.h>
-#include <e32cons.h>
-#include <AknForm.h>
-#include <AknQueryDialog.h>
-#include "MsChapv2NotifDlgPlugin.h"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CMsChapv2Dialog : public CAknMultiLineDataQueryDialog
-    {
-    protected:
-        CMsChapv2Dialog( CMsChapv2DialogPlugin* aPlugin, 
-                         TBool aUsernameExists );
-        void ConstructL();
-
-    public:
-        static CMsChapv2Dialog* NewL( TDes& aUsername, TDes& aPassword, 
-                                      CMsChapv2DialogPlugin*  aPlugin );
-        ~CMsChapv2Dialog();
-
-    private:
-        virtual TBool OkToExitL( TInt aButtonId );
-        void HandleResourceChange( TInt aType );
-        
-    private:
-        CMsChapv2DialogPlugin* iPlugin;     // Pointer to the notifier plugin
-        TBool iUsernameExists;
-    };
-
-#endif  // __MSCHAPV2DIALOG_H__
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/inc/MsChapv2NotifDlgPlugin.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of MsChapv2Notif Dialog Plugins
-*
-*/
-
-/*
-* %version: 11.1.7 %
-*/
-
-#ifndef __MSCHAPV2NOTIFDLGPLUGIN_H__
-#define __MSCHAPV2NOTIFDLGPLUGIN_H__
-
-
-// INCLUDES
-#include <eikdialg.h>
-#include <e32std.h>
-#include <e32base.h>
-#include <cdblen.h>
-#include <eiknotapi.h>
-#include <AknForm.h>
-#include <AknQueryDialog.h>
-#include <aknPopup.h>
-
-
-// CONSTANTS
-
-// UIDs for dialogs
-
-// ID of MsChapv2 username & password dialog
-const TUid KUidMsChapv2Dialog   = { 0x101f8e69 };  
-
-// Channel used for screen 
-const TUid KScreenOutputChannel = { 0x00000123 };  
-
-// Number of dialogs in this plugin
-const TInt KPluginGranularity   = 1;
-
-// ROM folder
-_LIT( KDriveZ, "z:" );
-
-// RSC file name.
-_LIT( KResourceFileName, "MsChapv2NotifDlgUi.rsc" );
-
-
-// GLOBAL FUNCTIONS
-
-/**
-* Array of connection dialog plugins.
-* @return A CArray of MEikSrvNotifierBase2 based classes.
-*/
-IMPORT_C CArrayPtr< MEikSrvNotifierBase2 >* NotifierArray();
-
-
-// CLASS DECLARATION
-
-struct TEapMsChapv2UsernamePasswordInfo
-    {
-    TBool iIsIdentityQuery;
-    TBool iPasswordPromptEnabled;
-    TBuf16<256> iUsername;
-    TBuf16<256> iPassword;
-    TBuf16<256> iOldPassword;
-    };
-
-class CMsChapv2Dialog;
-
-/**
- * MsChapv2 dialog plugin class
- */
-class CMsChapv2DialogPlugin : public CBase,
-                              public MEikSrvNotifierBase2
-    {
-    public:
-        static CMsChapv2DialogPlugin* NewL();
-
-        ~CMsChapv2DialogPlugin();
-
-        TNotifierInfo RegisterL();
-        TNotifierInfo Info() const;
-
-        TPtrC8 StartL( const TDesC8& aBuffer );
-        void StartL( const TDesC8& aBuffer, TInt aReplySlot,
-                     const RMessagePtr2& aMessage );
-
-        TPtrC8 UpdateL( const TDesC8& aBuffer );
-        void Cancel();
-        void CompleteL( TInt aStatus );
-        void Release();
-
-        inline TDes& GetUsername();
-        inline TDes& GetPassword();
-        inline void SetOldPassword( const TDesC& aOldPwd );
-
-    protected:
-        CMsChapv2DialogPlugin();
-
-        void ConstructL();
-
-    protected:
-        TNotifierInfo iInfo;        // Notifier info
-        RMessagePtr2 iMessage;      // Message
-        TInt iReplySlot;            // Reply slot
-        TBool iCancelled;           // ETrue if dialog cancelled
-
-    private:
-		CMsChapv2Dialog* iMSCHAPV2Dialog;
-        TEapMsChapv2UsernamePasswordInfo* iDataPtr;
-        TPckg<TEapMsChapv2UsernamePasswordInfo>* iDataPckgPtr;
-        TInt iResource;             // Resource
-    };
-
-// Include inline functions
-#include "MsChapv2NotifDlgPlugin.inl"
-
-
-#endif  // __MSCHAPV2NOTIFDLGPLUGIN_H__
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/inc/MsChapv2NotifDlgPlugin.inl	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Inline functions of MsChapv2Notif Dialog Plugins
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#ifndef __MSCHAPV2NOTIFDLGPLUGIN_INL__
-#define __MSCHAPV2NOTIFDLGPLUGIN_INL__
-
-
-// ---------------------------------------------------------
-// CMsChapv2DialogPlugin::GetUsername
-// ---------------------------------------------------------
-//
-inline TDes& CMsChapv2DialogPlugin::GetUsername() 
-    { 
-    return iDataPtr->iUsername;
-    }
-
-
-// ---------------------------------------------------------
-// CMsChapv2DialogPlugin::GetPassword
-// ---------------------------------------------------------
-//
-inline TDes& CMsChapv2DialogPlugin::GetPassword() 
-    { 
-    return iDataPtr->iPassword;
-    }
-
-
-// ---------------------------------------------------------
-// CMsChapv2DialogPlugin::SetOldPassword
-// ---------------------------------------------------------
-//
-inline void CMsChapv2DialogPlugin::SetOldPassword( const TDesC& aOldPwd ) 
-    { 
-    iDataPtr->iOldPassword = aOldPwd; 
-    }
-
-#endif  // __MSCHAPV2NOTIFDLGPLUGIN_INL__
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/loc/mschapv2notifdlg.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-MsChapV2 Notifier
-*
-*/
-
-/*
-* %version: %
-*/
-
-//  LOCALISATION STRINGS
-
-
-//d:Username query string.
-//l:popup_query_data_code_window
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_mschapv2_notif_username    "EAP-MSCHAPv2 user name:"
-
-
-//d:Password query string.
-//l:popup_query_data_code_window/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_mschapv2_notif_password    "Password:"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/src/MsChapv2NotifDialog.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of dialog class of MsChapv2NotifDlg
-*
-*/
-
-/*
-* %version: 18 %
-*/
-
-// INCLUDE FILES
-#include <mschapv2notifdlgui.rsg>
-#include "MsChapv2NotifDlgPlugin.h"
-#include "MsChapv2NotifDialog.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CMsChapv2Dialog::CMsChapv2Dialog
-// -----------------------------------------------------------------------------
-//
-CMsChapv2Dialog::CMsChapv2Dialog( CMsChapv2DialogPlugin* aPlugin, TBool aUsernameExists )
-: CAknMultiLineDataQueryDialog( ENoTone ), 
-  iPlugin( aPlugin ),
-  iUsernameExists( aUsernameExists )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2Dialog::NewL
-// -----------------------------------------------------------------------------
-//
-CMsChapv2Dialog* CMsChapv2Dialog::NewL( TDes& aUsername, TDes& aPassword,
-                                        CMsChapv2DialogPlugin* aPlugin )
-    {
-    CMsChapv2Dialog* self = new( ELeave ) CMsChapv2Dialog( aPlugin, aUsername.Length() > 0 );
-    CleanupStack::PushL( self );
-    if ( aUsername.Length() )
-        {
-        self->SetDataL( aUsername, aPassword );
-        }
-
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2Dialog::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CMsChapv2Dialog::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2Dialog::~CMsChapv2Dialog
-// -----------------------------------------------------------------------------
-//
-CMsChapv2Dialog::~CMsChapv2Dialog()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2Dialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CMsChapv2Dialog::OkToExitL( TInt aButtonId )
-    {
-    if ( CAknMultiLineDataQueryDialog::OkToExitL( aButtonId ) )
-        {
-        if ( aButtonId == EAknSoftkeyOk )
-            {
-            CAknMultilineQueryControl* firstControl = FirstControl();
-            firstControl->GetText( iPlugin->GetUsername() );
-
-            CAknMultilineQueryControl* secondControl = SecondControl();
-            secondControl->GetText( iPlugin->GetPassword() );
-        
-            _LIT( KEmpty, "" );     // Empty string
-
-            // Empty when we are not changing password
-            iPlugin->SetOldPassword( KEmpty );
-                  
-            iPlugin->CompleteL( KErrNone );
-            return( ETrue );
-            }
-        else
-            {
-            iPlugin->CompleteL( KErrCancel );
-            return( ETrue );
-            }
-        }
-
-    return( EFalse );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2Dialog::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CMsChapv2Dialog::HandleResourceChange( TInt aType )
-    {
-    CAknMultiLineDataQueryDialog::HandleResourceChange( aType );
-
-    if ( aType == KAknsMessageSkinChange )
-        {
-        }
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapMschapv2/NotifierUi/src/MsChapv2NotifDlgPlugin.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of MsChapv2NotifDlg dialog plugin.
-*
-*/
-
-/*
-* %version: 12.1.8 %
-*/
-
-// INCLUDE FILES
-#include <coemain.h>
-#include <eikenv.h>
-#include <bautils.h>
-#include <data_caging_path_literals.hrh>
-#include <mschapv2notifdlgui.rsg>
-
-#include <e32property.h>		// For RProperty 
-#include <UikonInternalPSKeys.h> // For KPSUidUikon and KUikGlobalNotesAllowed.
-
-#include "MsChapv2NotifDlgPlugin.h"
-#include "MsChapv2NotifDialog.h"
-
-
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-
-// -----------------------------------------------------------------------------
-// CreateNotifiersL
-// -----------------------------------------------------------------------------
-//
-LOCAL_C void CreateNotifiersL( 
-                          CArrayPtrFlat< MEikSrvNotifierBase2 >* aNotifiers )
-    {
-    MEikSrvNotifierBase2 *serNotify;
-    serNotify = CMsChapv2DialogPlugin::NewL();
-    CleanupStack::PushL( serNotify );
-    aNotifiers->AppendL( serNotify );
-    CleanupStack::Pop( serNotify );
-    }
-
-
-// -----------------------------------------------------------------------------
-// NotifierArray
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CArrayPtr< MEikSrvNotifierBase2 >* NotifierArray()
-    {
-    // NotifierArray() can't leave
-    CArrayPtrFlat< MEikSrvNotifierBase2 >* array = 
-                new CArrayPtrFlat< MEikSrvNotifierBase2 >( KPluginGranularity );
-
-    if ( array )
-        {
-        TRAPD( err, CreateNotifiersL( array ) );
-        
-        if( err )
-            {
-            TInt count = array->Count();
-
-            while( count-- )
-                {
-                ( *array )[ count ]->Release();
-                }
-
-            delete array;
-            array = NULL;
-            }
-        }
-
-    return( array );
-    }
-
-
-//////////////////////////////////////////////////////////////
-// MsChapv2 dialog plugin
-/////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::CMsChapv2DialogPlugin
-// -----------------------------------------------------------------------------
-//
-CMsChapv2DialogPlugin::CMsChapv2DialogPlugin()
-: iCancelled( EFalse )
-    {
-    iManager = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::~CMsChapv2DialogPlugin
-// -----------------------------------------------------------------------------
-//
-CMsChapv2DialogPlugin::~CMsChapv2DialogPlugin()
-    {
-    CCoeEnv::Static()->DeleteResourceFile( iResource );
-
-    if ( !iCancelled )
-        {
-        delete iMSCHAPV2Dialog;
-        }
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::RegisterL
-// -----------------------------------------------------------------------------
-//
-CMsChapv2DialogPlugin::TNotifierInfo CMsChapv2DialogPlugin::RegisterL()
-    {
-    iInfo.iUid      = KUidMsChapv2Dialog;
-    iInfo.iPriority = ENotifierPriorityHigh;
-    iInfo.iChannel  = KUidMsChapv2Dialog;
-    return iInfo;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::NewL
-// -----------------------------------------------------------------------------
-//
-CMsChapv2DialogPlugin* CMsChapv2DialogPlugin::NewL()
-    {
-    CMsChapv2DialogPlugin* self = new( ELeave ) CMsChapv2DialogPlugin();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CMsChapv2DialogPlugin::ConstructL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );   
-    fileName.Append( KResourceFileName );
-
-    BaflUtils::NearestLanguageFile( CCoeEnv::Static()->FsSession(), fileName );
-    iResource = CCoeEnv::Static()->AddResourceFileL( fileName );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::StartL
-// -----------------------------------------------------------------------------
-//
-TPtrC8 CMsChapv2DialogPlugin::StartL( const TDesC8& /*aBuffer*/ )
-    {
-    return KNullDesC8().Ptr();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::StartL
-// -----------------------------------------------------------------------------
-//
-void CMsChapv2DialogPlugin::StartL( const TDesC8& aBuffer, 
-                                    TInt aReplySlot, 
-                                    const RMessagePtr2& aMessage )
-    {
-    iCancelled = EFalse;
-    iReplySlot = aReplySlot;
-    iMessage   = aMessage;
-     
-    // This object gets constructed only once where as this gets called many 
-    // times, if user is not answering the query. 
-    // So initialize everything here itself.
-    iMSCHAPV2Dialog = NULL;
-    iDataPtr = NULL;
-    iDataPckgPtr = NULL;
-    
-    // We are about to display the password prompt.
-    // Since this part of the code can be executed during the bootup, check if 
-    // the UI has really started up to display notes/dialogs.
-    TInt notesAllowed = 0;
-    TInt error = RProperty::Get( KPSUidUikon, KUikGlobalNotesAllowed, 
-                                 notesAllowed );
-
-    // The above call can return error. Don't care the error. What we care is 
-    // if notesAllowed has turned to 1 from 0.
-    if ( notesAllowed )
-        {    
-        iDataPtr = new( ELeave ) TEapMsChapv2UsernamePasswordInfo;
-        iDataPtr->iIsIdentityQuery = ETrue;
-        iDataPtr->iPasswordPromptEnabled = ETrue;    
-        iDataPckgPtr = new( ELeave ) TPckg<TEapMsChapv2UsernamePasswordInfo>(
-                                                                *iDataPtr );
-        iDataPckgPtr->Copy(aBuffer);    
-    
-        iMSCHAPV2Dialog = CMsChapv2Dialog::NewL( iDataPtr->iUsername, 
-                                                 iDataPtr->iPassword, this );
-        iMSCHAPV2Dialog->ExecuteLD( R_MSCHAPV2NOTIF_USERNAME_PASSWORD_QUERY );
-        }
-
-    // In case if the notes are not allowed, this message gets completed when
-    // EAPOL time out occurs and a subsequent call to cancel from 
-    // eap_am_type_mschapv2_symbian_c::DoCancel().
-    }
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::UpdateL
-// -----------------------------------------------------------------------------
-//
-TPtrC8 CMsChapv2DialogPlugin::UpdateL( const TDesC8& /*aBuffer*/ )
-    {
-    return KNullDesC8().Ptr();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::Cancel
-// -----------------------------------------------------------------------------
-//
-void CMsChapv2DialogPlugin::Cancel()
-    {
-    if ( !iCancelled )
-        {
-        iCancelled = ETrue;
-        if ( !iMessage.IsNull() )
-            {
-            iMessage.Complete( KErrCancel );
-            }
-
-        if ( iMSCHAPV2Dialog )
-            {
-            delete iMSCHAPV2Dialog;
-            iMSCHAPV2Dialog = NULL;
-            }
-        }
-
-    if ( iDataPtr )
-        {
-        delete iDataPtr;
-        iDataPtr = NULL;
-        }
-
-    if ( iDataPckgPtr )
-        {
-        delete iDataPckgPtr;
-        iDataPckgPtr = NULL;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::CompleteL
-// -----------------------------------------------------------------------------
-//
-void CMsChapv2DialogPlugin::CompleteL( TInt aStatus )
-    { 
-    if ( aStatus == KErrNone && !iMessage.IsNull() )
-        {
-        iMessage.WriteL( iReplySlot, *iDataPckgPtr );
-        }
-    iCancelled = ETrue;
-    if ( !iMessage.IsNull() )
-        {
-        iMessage.Complete( aStatus );
-        }
-
-    if ( iDataPtr ) 
-        {
-        delete iDataPtr;
-        iDataPtr = NULL;		
-        }
-
-    if ( iDataPckgPtr )
-        {
-        delete iDataPckgPtr;
-        iDataPckgPtr = NULL;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::Release
-// -----------------------------------------------------------------------------
-//
-void CMsChapv2DialogPlugin::Release()
-    {
-    delete this;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CMsChapv2DialogPlugin::Info
-// -----------------------------------------------------------------------------
-//
-CMsChapv2DialogPlugin::TNotifierInfo CMsChapv2DialogPlugin::Info() const
-    {
-    return iInfo;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/data/EapPeapUi.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,557 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP PEAP UI resource file
-*
-*/
-
-/*
-* %version: 18 %
-*/
-
-CHARACTER_SET   UTF8
-
-//  RESOURCE IDENTIFIER
-NAME EPEP
-
-//  INCLUDES
-#include <eikon.rh>
-#include "EapPeapUi.hrh"   // Enums for these resources
-#include <eappeapui.loc>   // Localisation file
-#include <wlaneapsettingsui.loc>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-
-//  CONSTANTS  
-#define KUsernameMaxNameLength 255
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF16 { buf=""; }
-
-
-RESOURCE CBA r_peap_ui_softkeys_options_back_edit
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EPeapUiCmdChange; txt = qtn_msk_change; }
-        };
-    }
-    
-
-RESOURCE CBA r_peap_ui_softkeys_options_back_configure
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EPeapUiCmdConfigure; txt = qtn_msk_wlan_eap_configure; }
-        };
-    }
-
-
-RESOURCE CBA r_peap_ui_softkeys_options_back_enable
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EPeapUiCmdEnable; txt = qtn_msk_wlan_eap_cs_enable; }
-        };
-    }
-
-
-RESOURCE CBA r_peap_ui_softkeys_options_back_disable
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EPeapUiCmdDisable; txt = qtn_msk_wlan_eap_cs_disable; }
-        };
-    }
-    
-
-RESOURCE DIALOG r_peap_setting_dialog
-    {
-    flags = EEikDialogFlagFillAppClientRect | 
-            EEikDialogFlagCbaButtons | 
-            EEikDialogFlagWait | 
-            EEikDialogFlagNotifyEsc;
-    buttons = r_peap_ui_softkeys_options_back_edit;
-    pages = r_peap_pages;
-    }
-
-
-RESOURCE ARRAY r_peap_pages
-    {
-    items=
-        {
-        PAGE 
-            {
-            id = KEAPPEAPSETTINGSPAGE;
-            text = qtn_wlan_eap_tab_settings;
-            lines = r_peap_tab_settings; 
-            },
-
-        PAGE 
-            {
-            id = KEAPPEAPEAPPAGE;
-            text = qtn_wlan_eap_tab_eap_types; 
-            lines = r_peap_tab_eap_types; 
-            },
-
-        PAGE 
-            {
-            id = KEAPPEAPCIPHERPAGE;
-            text = qtn_wlan_eap_tab_cipher_suites; 
-            lines = r_peap_tab_cipher_suites; 
-            }
-        };
-    }
-
-
-// ******* PAGES ************
-// ******* 1st page *********
-RESOURCE ARRAY r_peap_tab_settings
-    {
-    items =
-         {
-            DLG_LINE
-                {
-                id = EPeapSettingsListbox;
-                type = EAknCtSettingListBox;
-                control = LISTBOX 
-                    {
-                    flags = EAknListBoxMenuList;
-                    };
-                }
-          };
-    }
-
-
-// ******* 2nd page *********
-RESOURCE ARRAY r_peap_tab_eap_types
-    {
-    items =
-        {
-        DLG_LINE
-            {
-            id = EPeapSettingsEapTypeListbox;
-            type = EAknCtSingleNumberListBox;
-            control = LISTBOX 
-                {
-                flags = EAknGenericListBoxFlags;
-                array_id = r_peap_eap_types_array;
-                };
-            }
-        };
-    }
-
-
-// ******* 3rd page *********
-RESOURCE ARRAY r_peap_tab_cipher_suites
-    {
-    items =
-        {
-        DLG_LINE
-            {
-            id = EPeapSettingsCipherSuiteListbox;
-            type = EAknCtSingleNumberListBox;
-            control = LISTBOX 
-                {
-                flags = EAknGenericListBoxFlags;
-                };
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_peap_eap_types_array
-    {
-    items =
-        {
-        LBUF { txt = "1\tEAP-TLS"; },
-        LBUF { txt = "2\tEAP-MSCHAPv2"; },
-        LBUF { txt = "3\tEAP-SIM"; },
-        LBUF { txt = "4\tEAP-GTC"; }
-        };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_peap_username_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_wlan_eap_sett_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_peap_setting_edwin;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_peap_realm_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm;
-    type = EEikCtEdwin;
-    editor_resource_id = r_peap_setting_edwin;
-    }
-
-
-RESOURCE EDWIN r_peap_setting_edwin 
-    {
-    flags = 0;
-    width = 9;
-    lines = 5;
-    maxlength = 255;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_radio_button_setting_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    type = EAknSetListBox;
-    editor_resource_id= r_setting_listbox;
-    }
-
-
-RESOURCE LISTBOX r_setting_listbox 
-    {
-    flags = EEikListBoxMultipleSelection;
-    }
-
-
-
-RESOURCE MENU_BAR r_peap_menubar
-    {
-    titles =
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_peap_menu_pane; 
-            txt = ""; 
-            }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_peap_menu_pane
-    {
-    items =
-        {
-        MENU_ITEM 
-            { 
-            command = EPeapUiCmdConfigure;
-            txt = qtn_wlan_options_eap_plugin_configure; 
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EPeapUiCmdEnable;
-            txt = qtn_wlan_options_eap_plugin_enable; 
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EPeapUiCmdDisable;
-            txt = qtn_wlan_options_eap_plugin_disable; 
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EPeapUiCmdMoveUp;
-            txt = qtn_wlan_options_eap_plugin_priority_up;
-            flags = EEikMenuItemSpecific; 
-            },
-
-        MENU_ITEM 
-            { 
-            command = EPeapUiCmdMoveDown;
-            txt = qtn_wlan_options_eap_plugin_priority_down; 
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EPeapUiCmdChange;
-            txt = qtn_options_change; 
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp;
-            txt = qtn_options_help; 
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdExit;
-            txt = qtn_options_exit; 
-            }
-        };
-    }
-
-
-// Resource strings
-RESOURCE TBUF r_peap_settings_title        { buf = qtn_wlan_eap_peap_title; }
-RESOURCE TBUF r_peap_username_inusestring      \
-                                  { buf = qtn_wlan_eap_sett_username_inuse; }
-RESOURCE TBUF r_peap_username_inusestring_auto \
-                        { buf = qtn_wlan_eap_sett_username_inuse_from_cert; }
-RESOURCE TBUF r_peap_username_inusestring_conf \
-                             { buf = qtn_wlan_eap_sett_username_inuse_user; }
-RESOURCE TBUF r_peap_username_string    { buf = qtn_wlan_eap_sett_username; }
-RESOURCE TBUF r_peap_realm_inusestring         \
-                                     { buf = qtn_wlan_eap_sett_realm_inuse; }
-RESOURCE TBUF r_peap_realm_inusestring_auto    \
-                           { buf = qtn_wlan_eap_sett_realm_inuse_from_cert; }
-RESOURCE TBUF r_peap_realm_inusestring_conf    \
-                                { buf = qtn_wlan_eap_sett_realm_inuse_user; }
-RESOURCE TBUF r_peap_realm_string          { buf = qtn_wlan_eap_sett_realm; }
-RESOURCE TBUF r_peap_user_cert_string          \
-                                { buf = qtn_wlan_eap_sett_user_certificate; }
-RESOURCE TBUF r_peap_ca_cert_string            \
-                                  { buf = qtn_wlan_eap_sett_ca_certificate; }
-RESOURCE TBUF r_peap_not_defined     { buf = qtn_wlan_eap_cert_not_defined; }
-RESOURCE TBUF r_peap_none_selection            \
-                                  { buf = qtn_wlan_eap_cert_none_selection; }
-
-RESOURCE TBUF r_peap_suite_rsarc4md5 { buf = qtn_wlan_eap_cipher_rsarc4md5; }
-RESOURCE TBUF r_peap_suite_rsarc4sha { buf = qtn_wlan_eap_cipher_rsarc4sha; }
-RESOURCE TBUF r_peap_suite_rsa3dessha          \
-                                    { buf = qtn_wlan_eap_cipher_rsa3dessha; }
-RESOURCE TBUF r_peap_suite_dhersa3dessha       \
-                                 { buf = qtn_wlan_eap_cipher_dhersa3dessha; }
-RESOURCE TBUF r_peap_suite_dhedss3dessha       \
-                                 { buf = qtn_wlan_eap_cipher_dhedss3dessha; }
-RESOURCE TBUF r_peap_suite_rsaaessha { buf = qtn_wlan_eap_cipher_rsaaessha; }
-RESOURCE TBUF r_peap_suite_dhersaaessha        \
-                                  { buf = qtn_wlan_eap_cipher_dhersaaessha; }
-RESOURCE TBUF r_peap_suite_dhedssaessha        \
-                                  { buf = qtn_wlan_eap_cipher_dhedssaessha; }
-
-RESOURCE TBUF r_peap_allow_peapv0   { buf = qtn_wlan_eap_sett_allow_peapv0; }
-RESOURCE TBUF r_peap_allow_peapv1   { buf = qtn_wlan_eap_sett_allow_peapv1; }
-RESOURCE TBUF r_peap_allow_peapv2   { buf = qtn_wlan_eap_sett_allow_peapv2; }
-RESOURCE TBUF r_peap_allow_yes    { buf = qtn_wlan_eap_sett_allow_peap_yes; }
-RESOURCE TBUF r_peap_allow_no      { buf = qtn_wlan_eap_sett_allow_peap_no; }
-RESOURCE TBUF r_peap_info_cannot_disable_all_eap_plugins \
-                      { buf = qtn_wlan_info_cannot_disable_all_eap_plugins; }
-RESOURCE TBUF r_peap_tls_privacy_string
-                                  { buf = qtn_wlan_eap_sett_tls_privacy; }
-
-
-// ********************************************
-// USERNAME IN USE AND REALM POPUP DEFINITION
-// ********************************************
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_peap_username_autouseconf_texts
-    {
-    setting_texts_resource = r_peap_username_autouseconf_texts_resource;
-    popped_up_texts_resource = r_peap_username_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_peap_username_autouseconf_texts_resource
-    {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_username_inuse_from_cert; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_username_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_peap_username_automatic_useconfigured_array
-    {
-    items =
-        {
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_from_cert; },
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_user; }
-        };
-    }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_peap_realm_autouseconf_texts
-    {
-    setting_texts_resource = r_peap_realm_autouseconf_texts_resource;
-    popped_up_texts_resource = r_peap_realm_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_peap_realm_autouseconf_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_realm_inuse_from_cert; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_realm_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_peap_realm_automatic_useconfigured_array
-    {
-    items=
-        {
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_from_cert; },
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_user; }
-        };
-    }
-
-RESOURCE ARRAY r_peap_tls_privacy_autouseconf_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_tls_privacy_off; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_tls_privacy_on; 
-            }
-        };
-    }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_peap_tls_privacy_autouseconf_texts
-    {
-    setting_texts_resource = r_peap_tls_privacy_autouseconf_texts_resource;
-    popped_up_texts_resource = r_peap_tls_privacy_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_peap_tls_privacy_automatic_useconfigured_array
-    {
-    items =
-        {
-        LBUF { txt = qtn_wlan_eap_sett_tls_privacy_off; },
-        LBUF { txt = qtn_wlan_eap_sett_tls_privacy_on; }
-        };
-    }
-
-RESOURCE AVKON_SETTING_PAGE r_peap_display_autouseconf_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm_inuse;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_peap_setting_enumerated_popup;
-    }
-
-
-RESOURCE POPUP_SETTING_LIST r_peap_setting_enumerated_popup
-    {
-    flags = EAknPopupSettingListFlagInitialised;
-    }
-
-
-// ********************************************
-// ALLOW PEAP VERSIONS POPUP DEFINITION
-// ********************************************
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_peap_allow_version_texts
-    {
-    setting_texts_resource = r_peap_allow_version_texts_resource;
-    popped_up_texts_resource = r_peap_allow_version_array;
-    }
-
-
-RESOURCE ARRAY r_peap_allow_version_texts_resource
-    {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_allow_peap_no; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_allow_peap_yes; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_peap_allow_version_array
-    {
-    items=
-        {
-        LBUF { txt = qtn_wlan_eap_sett_allow_peap_no; },
-        LBUF { txt = qtn_wlan_eap_sett_allow_peap_yes; }
-        };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_peap_allow_version_0
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_allow_peapv0;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_peap_setting_enumerated_popup;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_peap_allow_version_1
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_allow_peapv1;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_peap_setting_enumerated_popup;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_peap_allow_version_2
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_allow_peapv2;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_peap_setting_enumerated_popup;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/inc/EapPeapUi.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP PEAP UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _EAPPEAPUI_HRH_
-#define _EAPPEAPUI_HRH_
-
-enum TEapPeapUiMenuCommands
-    {
-    EPeapUiCmdUndefined = 6000,
-    EPeapUiCmdChange,
-    EPeapUiCmdEnable,
-    EPeapUiCmdDisable,
-    EPeapUiCmdConfigure,
-	EPeapUiCmdMoveUp,
-    EPeapUiCmdMoveDown,
-	EPeapUiCmdViewDetails
-    };
-
-enum TEapPeapUiNotes
-    {
-    TEapPeapUiGeneralError = 6100
-    };
-
-enum TEapPeapUiLines
-	{
-	EPeapSettingsListBox = 6200
-	};
-
-enum TEapPeapUiSettingIds
-	{
-	EPeapSettingUserCert=6300,
-	EPeapSettingCaCert,
-	EPeapSettingUsernameInUseId,
-	EPeapSettingUsernameId,
-	EPeapSettingRealmInUseId,
-	EPeapSettingRealmId,
-	EPeapSettingTlsPrivacyId
-	};
-
-enum TEapPeapUiSettingPageIds
-	{
-	EPeapSettingPageUserCertificates=6400,
-	EPeapSettingPageCaCertificates,
-	EPeapSettingPageCipherSuites,
-	EPeapSettingPageEapTypes,
-	EPeapSettingPageSettings
-	};
-
-enum TEapPeapUiListBoxes
-	{
-	EPeapSettingsUserCertListbox=6500,
-	EPeapSettingsCaCertListbox,
-	EPeapSettingsCipherSuiteListbox,
-	EPeapSettingsEapTypeListbox,
-	EPeapSettingsListbox
-	};
-
-enum TEapPeapSettingItems
-	{
-	EPeapTabSheetSettingsUsernameInUse=6600,
-	EPeapTabSheetSettingsUsername,
-	EPeapTabSheetSettingsRealmInUse,
-	EPeapTabSheetSettingsRealm
-	};
-	
-// Constants that are used as page ids
-// TEapPeapUiSettingPageIds does not work for this purpose
-#define KEAPPEAPSETTINGSPAGE 1
-#define KEAPPEAPEAPPAGE      2
-#define KEAPPEAPCIPHERPAGE   3
-
-
-
-#endif  //_EAPPEAPUI_HRH_
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/inc/EapPeapUiSettingArray.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP PEAP UI settings array
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPPEAPUISETTINGARRAY_H_
-#define _EAPPEAPUISETTINGARRAY_H_
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-#include "EapPeapUi.hrh"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CEapPeapSettingItemArray : public CBase
-    {
-    public:
-        static CEapPeapSettingItemArray* NewL();
-        virtual ~CEapPeapSettingItemArray();
-        CAknSettingItem* Item( TEapPeapUiSettingPageIds aItem );
-        CAknSettingItemArray* Array();
-        void StoreSettingsL();
-        void AddTextItemL( TDes& aBuffer, 
-                           TInt aId, 
-                           TInt aTitleResource, 
-                           TInt aSettingPageResource, 
-                           TInt aAssociatedResource, 
-                           TInt aOrdinal );
-        void AddBinarySettingItemL( TInt aSettingPageResourceId,
-                                    TInt aTitleResourceId,
-                                    TInt aAssociatedResourceId,
-                                    TInt aOrdinal,
-                                    TBool& aModifiedValue);
-
-    protected:
-        CEapPeapSettingItemArray();
-        void ConstructL();
-
-    private:
-        CAknSettingItemArray* iArray;
-    };
-
-#endif  // _EAPPEAPUISETTINGARRAY_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/inc/EapPeapUiView.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP PEAP UI setting dialog
-*
-*/
-
-/*
-* %version: 21 %
-*/
-
-#ifndef _EAPPEAPUIVIEW_H_
-#define _EAPPEAPUIVIEW_H_
-
-// INCLUDES
-#include <AknDialog.h>        // AVKON components
-#include <eikspane.h> // For changing status pane 
-#include <akntitle.h>
-#include <aknsettingitemlist.h>
-#include <aknlists.h>
-#include <aknselectionlist.h>
-#include <eiklbo.h>
-#include "EapPeapUi.hrh"
-#include <EapTlsPeapUiCipherSuite.h>
-#include <EapTlsPeapUiEapType.h>
-#include <EapTlsPeapUiCertificate.h>
-#include <AbsEapTlsPeapUiCertificates.h>
-#include <EapTlsPeapUiConnection.h>
-#include <EapTlsPeapUiDataConnection.h>
-#include <EapTlsPeapUiTlsPeapData.h>
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CSettingsListBoxItemDrawer;
-class CEapPeapSettingItemArray;
-
-
-// CLASS DECLARATION
-
-/**
-*  Settings dialog class definition
-*/
-class CEapPeapUiDialog : public CAknDialog, 
-                         public MEapTlsPeapUiCertificates,
-                         public MEikListBoxObserver
-    {
-    public:
-        CEapPeapUiDialog( CEapTlsPeapUiConnection* aConnection, 
-                          TIndexType aIndexType, TInt aIndex, 
-                          TInt& aButtonId );
-
-        ~CEapPeapUiDialog();
-
-        /**
-        * Create and launch dialog.
-        * @param aResourceId The resource ID of the dialog to load.
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( TInt aResourceId );
-        
-        /**
-        * Chain into key event handler.
-        * @param aKeyEvent The event.
-        * @param aType The type of key event.
-        * @return Was the key consumed or not.
-        */
-        TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,
-                                          TEventCode aType);
-                                          
-        
-    public: // From MEikListBoxObserver
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-        
-    
-    public: // From CEikDialog
-            
-        /**
-        * @see CEikDialog
-        */
-        void HandleDialogPageEventL( TInt aEventID );
-                                          
-
-    protected:
-        void PreLayoutDynInitL();
-        void PostLayoutDynInitL();
-        TBool OkToExitL( TInt aButtonId );
-        void ProcessCommandL( TInt aCommand );
-        void PageChangedL( TInt aPageId );
-
-    private:
-        void ChangeTitleL( TBool aIsStarted );
-        void DrawSettingsListL();
-        void ShowSettingPageL( TInt aCalledFromMenu ); 
-        void MoveEapTypeL( TInt aOldPos, TInt aNewPos );
-        void DrawEapListL(TInt aWantedIndex);
-        TInt ShowRadioButtonSettingPageL( TInt aTitle, CDesCArrayFlat* aValues,
-                                          TInt aCurrentItem );
-        void DrawCipherSuitesL();
-        void CompleteReadCertificates( const TInt aResult );
-        void CompleteUiConstructionL();
-        TInt CheckActiveUserCertificate();
-        TInt CheckActiveCaCertificate();
-        void UserCertificateHouseKeeping( TInt aSelected );
-        void CaCertificateHouseKeeping( TInt aSelected );
-        void CreateEapTypeDataBaseL();    
-        void SetCipherIconsL();
-        void SetEapIconsL();
-        TUint GetEnabledEapTypeCount();
-        void GetHelpContext(TCoeHelpContext& aContext) const;
-            
-        void GetFullCertLabelL( const SCertEntry& aCert, TDes& aFullLabel );
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-        void ConfigureL( TBool aQuick );
-        
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-        CEapTlsPeapUiDataConnection* iDataConnection;
-        CEapTlsPeapUiCipherSuites* iCipherSuites;
-        CEapTlsPeapUiCertificates* iCertificates;
-        
-        CEapTlsPeapUiTlsPeapData* iUiData;
-        CArrayFixFlat<TEapTlsPeapUiCipherSuite>* iUiCipherSuites;
-        CArrayFixFlat<TEapTlsPeapUiCertificate>* iUiUserCertificates;
-        CArrayFixFlat<TEapTlsPeapUiCertificate>* iUiCACertificates;
-        CArrayFixFlat<TEapTlsPeapUiEapType>* iUiEapTypes;
-                                
-        CAknSingleNumberStyleListBox* iUserCertificateListBox;
-        CAknSingleNumberStyleListBox* iCaCertificateListBox;
-        CAknSingleNumberStyleListBox* iCipherSuiteListBox;
-        CAknSingleNumberStyleListBox* iEapTypesListBox;
-        CEapPeapSettingItemArray* iSettingArray;
-        CAknSettingStyleListBox* iSettingListBox;
-        CDesCArray* iEapTypeViewArray;
-        CDesCArray* iCipherSuitesViewArray;
-        CEapTlsPeapUiEapTypes* iEapTypes;
-        TIndexType iIndexType; 
-        TInt iIndex;
-        HBufC* iPreviousText;
-        TInt* iButtonId;
-        
-        // Tells the status of UI construction. TRUE if UI construction is completed.
-		TBool iIsUIConstructionCompleted;
-		
-		// For exiting dialog
-		TBool iExiting;
-    };
-
-
-#endif // _EAPPEAPUIVIEW_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/loc/eappeapui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-PEAP authentication settings
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:UI title for main view
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_peap_title             "EAP-PEAP settings"
-
-
-//d:Setting list item, static part. User is able to define the settings for 
-//d:the usage of different PEAP versions in WLAN authentication.
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_allow_peapv0      "Allow PEAPv0"
-
-
-//d:Setting list item, static part. User is able to define the settings for 
-//d:the usage of different PEAP versions in WLAN authentication.
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_allow_peapv1      "Allow PEAPv1"
-
-
-//d:Setting list item, static part. User is able to define the settings for 
-//d:the usage of different PEAP versions in WLAN authentication.
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_allow_peapv2      "Allow PEAPv2"
-
-
-//d:Setting list item, dynamic part. Displayed below one of the texts 
-//d:"Allow PEAPv0" (qtn_wlan_eap_sett_allow_peapv0), "Allow PEAPv1" 
-//d:(qtn_wlan_eap_sett_allow_peapv1) or "Allow PEAPv2" 
-//d:(qtn_wlan_eap_sett_allow_peapv2). 
-//d:Allows the usage of a different version of PEAP.
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_allow_peap_yes    "Yes"
-
-
-//d:Setting list item, dynamic part. Displayed below one of the texts 
-//d:"Allow PEAPv0" (qtn_wlan_eap_sett_allow_peapv0), "Allow PEAPv1" 
-//d:(qtn_wlan_eap_sett_allow_peapv1) or "Allow PEAPv2" 
-//d:(qtn_wlan_eap_sett_allow_peapv2). 
-//d: Denies the usage of a different version of PEAP.
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_allow_peap_no     "No"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUi.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP PEAP UI class
-*
-*/
-
-/*
-* %version: 15 %
-*/
-
-// INCLUDE FILES
-#include "EapPeapUi.h"
-#include "EapTlsPeapUiConnection.h"
-#include "EapPeapUiView.h"
-#include <eappeapui.rsg>
-#include <bautils.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "eappeapui.rsc" );
-
-
-// CLASS DECLARATION
-class TResourceFileCleanupItem
-    {
-    public:
-        CCoeEnv* iCoeEnv;
-        TInt iResourceFileOffset;
-    }; 
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupResourceFile
-// -----------------------------------------------------------------------------
-//
-static void CleanupResourceFile( TAny* aObject )
-    {
-    TResourceFileCleanupItem* item = 
-                        REINTERPRET_CAST( TResourceFileCleanupItem*, aObject );
-    item->iCoeEnv->DeleteResourceFile( item->iResourceFileOffset );
-    delete item;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapPeapUi::CEapPeapUi
-// -----------------------------------------------------------------------------
-//
-CEapPeapUi::CEapPeapUi( CEapTlsPeapUiConnection* aConnection, 
-                        TIndexType aIndexType, 
-                        TInt aIndex ) 
-: iConnection( aConnection ), 
-  iIndexType( aIndexType ), 
-  iIndex( aIndex ) 
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUi::NewL
-// -----------------------------------------------------------------------------
-//
-CEapPeapUi* CEapPeapUi::NewL( CEapTlsPeapUiConnection* aConnection, 
-                              TIndexType aIndexType, 
-                              TInt aIndex )
-    {
-    CEapPeapUi* self = 
-                new( ELeave ) CEapPeapUi( aConnection, aIndexType, aIndex );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );    
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUi::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUi::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUi::~CEapPeapUi
-// -----------------------------------------------------------------------------
-//
-CEapPeapUi::~CEapPeapUi()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUi::InvokeUiL
-// -----------------------------------------------------------------------------
-//
-TInt CEapPeapUi::InvokeUiL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    CCoeEnv* coeEnv = CCoeEnv::Static();
-    BaflUtils::NearestLanguageFile( coeEnv->FsSession(), fileName );
-
-    TResourceFileCleanupItem* item = new( ELeave ) TResourceFileCleanupItem;
-
-    item->iCoeEnv = coeEnv;
-    CleanupStack::PushL( TCleanupItem( CleanupResourceFile, item ) );
-    item->iResourceFileOffset = coeEnv->AddResourceFileL( fileName );
-
-    TInt buttonId;
-    CEapPeapUiDialog* settingsDlg = new( ELeave ) CEapPeapUiDialog( 
-                                iConnection, iIndexType, iIndex, buttonId );
-    settingsDlg->ConstructAndRunLD( R_PEAP_SETTING_DIALOG );
-
-    CleanupStack::PopAndDestroy();  // For resource file
-
-    return buttonId;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUiSettingArray.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP PEAP UI settings array
-*
-*/
-
-/*
-* %version: 13 %
-*/
-
-// INCLUDE FILES
-#include "EapPeapUiSettingArray.h"
-#include "EapPeapUi.hrh"
-#include <aknsettingitemlist.h>
-#include <akntextsettingpage.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::CEapPeapSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapPeapSettingItemArray::CEapPeapSettingItemArray()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::NewL
-// -----------------------------------------------------------------------------
-//
-CEapPeapSettingItemArray* CEapPeapSettingItemArray::NewL() 
-    {
-    CEapPeapSettingItemArray* self = new( ELeave ) CEapPeapSettingItemArray();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); // self
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::~CEapPeapSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapPeapSettingItemArray::~CEapPeapSettingItemArray()
-    {
-    if( iArray ) 
-        {
-        // ResetAndDestroy()
-        iArray->ResetAndDestroy();
-        }    
-    delete iArray;   
-    iArray = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::Item
-// -----------------------------------------------------------------------------
-//
-CAknSettingItem* CEapPeapSettingItemArray::Item( TEapPeapUiSettingPageIds aId )
-    {
-    for( TInt i = 0; i < iArray->Count(); i++ )
-        {
-        if( iArray->At( i )->Identifier() == aId )
-            {
-            return iArray->At( i );
-            }
-        }
-
-    __ASSERT_DEBUG( EFalse, User::Invariant() );
-    return NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::Array
-// -----------------------------------------------------------------------------
-//
-CAknSettingItemArray* CEapPeapSettingItemArray::Array() 
-    {
-    return iArray;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::StoreSettingsL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapSettingItemArray::StoreSettingsL()
-    {
-    // Do what SettingItemList::StoreSettings would do. 
-    for( TInt i( 0 ); i < iArray->Count(); ++i ) 
-        {
-        iArray->At( i )->StoreL();
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapSettingItemArray::ConstructL() 
-    {
-    iArray = new( ELeave ) CAknSettingItemArray( 2, EFalse, 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::AddTextItemL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapSettingItemArray::AddTextItemL( TDes& aBuffer, 
-                                             TInt aId, 
-                                             TInt aTitleResource, 
-                                             TInt aSettingPageResource, 
-                                             TInt aAssociatedResource, 
-                                             TInt aOrdinal)
-    {
-    // Create new setting item
-    CAknTextSettingItem* settingItem = 
-                            new( ELeave ) CAknTextSettingItem( aId, aBuffer );
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KNullDesC );
-    settingItem->SetSettingPageFlags( 
-                                    CAknTextSettingPage::EZeroLengthAllowed );
-
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResource );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList,
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    
-    CleanupStack::PopAndDestroy( itemTitle );
-    // Items are destroyed in destructor when resetting array
-    CleanupStack::Pop( settingItem ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapSettingItemArray::AddBinarySettingItemL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapSettingItemArray::AddBinarySettingItemL( 
-                                                TInt aSettingPageResourceId,
-                                                TInt aTitleResourceId, 
-                                                TInt aAssociatedResourceId,
-                                                TInt aOrdinal, 
-                                                TBool& aModifiedValue )
-    {
-    CAknSettingItem* settingItem = new ( ELeave ) 
-    CAknBinaryPopupSettingItem( 0, aModifiedValue );
-    CleanupStack::PushL( settingItem );
-
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResourceId );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResourceId, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResourceId );
-    iArray->AppendL( settingItem );
-
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPeap/ConfigUi/src/EapPeapUiView.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1841 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP PEAP UI settings dialog
-*
-*/
-
-/*
-* %version: 37.1.9 %
-*/
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include "EapPeapUiView.h"
-#include "EapPeapUi.hrh"
-#include <eappeapui.rsg>
-#include <akntextsettingpage.h>
-#include <aknsettingitemlist.h>
-#include "EapPeapUiSettingArray.h"
-#include <aknnavi.h>
-#include <akntabgrp.h>
-#include <aknnavide.h>
-#include <aknnotewrappers.h>
-#include <aknradiobuttonsettingpage.h>
-#include <StringLoader.h>
-#include <EapTlsPeapUiConnection.h>
-#include <EapTlsPeapUiDataConnection.h>
-#include <EapTlsPeapUiTlsPeapData.h>
-#include <EapTlsPeapUiCipherSuites.h>
-#include <EapTlsPeapUiEapTypes.h>
-#include <EapTlsPeapUiCertificates.h>
-#include <EapType.h>
-#include <EapTypeInfo.h> // For EAP type info query
-#include <AknIconArray.h>
-#include <AknsUtils.h>
-#include <featmgr.h>
-#include <hlplch.h>
-
-
-// CONSTANTS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
-
-
-static const TInt KSettingArrayGranularity = 4;    
-static const TInt KSuiteArrayGranularity = 5;
-static const TInt KMaxLengthOfEapLine = 270;
-static const TInt KCertificateArrayGranularity = 5;
-static const TInt KMaxLengthOfSuiteName = 255;
-static const TInt KEapPeapId = 25;
-
-_LIT( KNameSeparator, " " );
-_LIT( KEmptyString, "" );
-const TUint KFirstElement = 0;
-const TUint KSecondElement = 1;
-const TUint KMinEnabledCount = 1;
-
-/* This is the maximum length of a certificate's full name, includes
-label, primary and secondary names */
-const TUint32 KMaxFullCertLabelLength = KMaxCertLabelLength + 2 * 
-                                    KMaxNameLength + 1; // 1 is for separator.
-
-
-// MODULE DATA STRUCTURES
-enum TPageIds
-    {
-    ESettingsPage=0,
-    EEapTypePage,
-    ECipherSuitePage
-    };
-
-
-enum TSettingIds
-    {
-    EUserCertificateItem=0,
-    ECaCertificateItem,
-    EUsernameInUseItem,
-    EUsernameItem,
-    ERealmInUseItem,
-    ERealmItem
-    };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::CEapPeapUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapPeapUiDialog::CEapPeapUiDialog( CEapTlsPeapUiConnection* aConnection,
-                                    TIndexType aIndexType, 
-                                    TInt aIndex, 
-								    TInt& aButtonId ) 
-: CAknDialog(),
-  iConnection( aConnection ),
-  iIndexType( aIndexType ), 
-  iIndex( aIndex ), 
-  iButtonId( &aButtonId ),
-  iIsUIConstructionCompleted( EFalse ),
-  iExiting( EFalse )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CEapPeapUiDialog::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CEapPeapUiDialog::ConstructAndRunLD( TInt aResourceId )
-    {
-    CleanupStack::PushL( this );
-
-    iSettingArray = CEapPeapSettingItemArray::NewL();
-
-    User::LeaveIfError( iConnection->Connect() );
-
-    // Basic data
-    iDataConnection = iConnection->GetDataConnection();
-    if ( iDataConnection == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iDataConnection->Open() );
-    User::LeaveIfError( iDataConnection->GetData( &iUiData ) );
-    
-    // Cipher suites
-    iCipherSuites = iConnection->GetCipherSuiteConnection();
-    if ( iCipherSuites == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-
-    User::LeaveIfError( iCipherSuites->Open() );
-    User::LeaveIfError( iCipherSuites->GetCipherSuites( &iUiCipherSuites ) );
-
-    iCipherSuitesViewArray = new( ELeave ) CDesCArrayFlat( 
-                                                    KSuiteArrayGranularity );
-
-    //EAP types 
-    iEapTypes = iConnection->GetEapTypeConnection();
-    if ( iEapTypes == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iEapTypes->Open() );
-    User::LeaveIfError( iEapTypes->GetEapTypes( &iUiEapTypes ) );
-
-    if ( iUiEapTypes->Count() == 0 )
-        {
-        CreateEapTypeDataBaseL();
-        }
-    iEapTypeViewArray = new( ELeave ) CDesCArrayFlat( 
-                                                    KSettingArrayGranularity );
-
-    FeatureManager::InitializeLibL();
-    
-    ConstructL( R_PEAP_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-    
-    return CAknDialog::ExecuteLD( aResourceId );
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CEapPeapUiDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                     TEventCode aType )
-    {
-    TKeyResponse result( EKeyWasNotConsumed );
-    
-    // gently handle impatient users
-    if ( !iIsUIConstructionCompleted )
-        {
-        return CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-        }
-        
-    TInt pageId = ActivePageId();
-    
-    if ( aType == EEventKey && pageId == KEAPPEAPCIPHERPAGE )
-        {
-        
-        TInt indexBefore = iCipherSuiteListBox->CurrentItemIndex();
-        
-        // Handle Enter key here, since it doesn't seem to convert into
-        // the proper command id via the normal route
-        // (maybe some Avkon support for Enter key is still missing in
-        // S60 3.2 2008_wk22)
-        if ( aKeyEvent.iCode == EKeyEnter )
-            {
-            if ( ( *iUiCipherSuites )[indexBefore].iIsEnabled )
-                {
-                OkToExitL( EPeapUiCmdDisable );
-                }
-            else
-                {
-                OkToExitL( EPeapUiCmdEnable );
-                }
-                
-            result = EKeyWasConsumed;
-            }
-        else
-            {
-            result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-            }
-        TInt indexAfter = iCipherSuiteListBox->CurrentItemIndex();
-
-        if ( indexBefore != indexAfter )
-            {
-            CEikButtonGroupContainer& cba = ButtonGroupContainer();
-            if( ( *iUiCipherSuites )[indexAfter].iIsEnabled )
-                {
-                cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-                }
-            else
-                {
-                cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                }
-            
-            cba.DrawDeferred();
-            }
-        }
-    else if ( aType == EEventKey && pageId == KEAPPEAPEAPPAGE )
-        {
-        TInt indexBefore = iEapTypesListBox->CurrentItemIndex();
-        // Handle Enter key here, since it doesn't seem to convert into
-        // the proper command id via the normal route
-        // (maybe some Avkon support for Enter key is still missing in
-        // S60 3.2 2008_wk22)
-        if ( aKeyEvent.iCode == EKeyEnter )
-            {
-            if ( ( *iUiEapTypes )[indexBefore].iIsEnabled )
-                {
-                OkToExitL( EPeapUiCmdConfigure );
-                }
-            else
-                {
-                OkToExitL( EPeapUiCmdEnable );
-                }
-                
-            result = EKeyWasConsumed;
-            }
-        else
-            {
-            result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-            }
-
-                
-        TInt indexAfter = iEapTypesListBox->CurrentItemIndex();
-
-        if ( indexBefore != indexAfter )
-            {
-            CEikButtonGroupContainer& cba = ButtonGroupContainer();
-            if( ( *iUiEapTypes )[indexAfter].iIsEnabled )
-                {
-                cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_CONFIGURE );
-                }
-            else
-                {
-                cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                }
-            
-            cba.DrawDeferred();
-            }        
-        }
-    else
-        {
-        result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-        }
-
-    return result;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::~CEapPeapUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapPeapUiDialog::~CEapPeapUiDialog()
-    {
-    if ( iSettingArray )
-        {
-        iSettingArray->Array()->ResetAndDestroy();
-        }
-
-    delete iSettingArray;
-    iSettingListBox = NULL;
-    
-    iDataConnection->Close();
-    delete iDataConnection;
-
-    iCipherSuitesViewArray->Reset();
-    delete iCipherSuitesViewArray;    
-
-    iEapTypeViewArray->Reset();
-    delete iEapTypeViewArray;
-
-    iCertificates->Close();
-    delete iCertificates;
-    
-    iCipherSuites->Close();
-    delete iCipherSuites;
-        
-    iEapTypes->Close();
-    delete iEapTypes;
-
-    iConnection->Close();
-    
-    delete iPreviousText;
-    
-    FeatureManager::UnInitializeLib();
-    }
-
-
-// ---------------------------------------------------------
-// CEapPeapUiDialog::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CEapPeapUiDialog::HandleListBoxEventL( CEikListBox* aListBox,
-                                            TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            if ( aListBox == iSettingListBox )
-                {
-                OkToExitL( EPeapUiCmdChange );                    
-                }
-                
-            else if ( aListBox == iEapTypesListBox )
-                {
-                TInt index = iEapTypesListBox->CurrentItemIndex();
-                if ( iUiEapTypes->At( index ).iIsEnabled )
-                    {
-                    ConfigureL( ETrue );    
-                    }
-                else
-                    {
-                    OkToExitL( EPeapUiCmdEnable );
-                    }                    
-                }
-                                     
-            else if ( aListBox == iCipherSuiteListBox )
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                if ( iUiCipherSuites->At( index ).iIsEnabled )
-                    {
-                    OkToExitL( EPeapUiCmdDisable );
-                    }
-                else
-                    {
-                    OkToExitL( EPeapUiCmdEnable );
-                    }
-                }
-                
-            else
-                {
-                // Do nothing; we should never end up here
-                }
-                            
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }   
-
-
-// ---------------------------------------------------------
-// CEapPeapUiDialog::HandleDialogPageEventL
-// ---------------------------------------------------------
-//
-void CEapPeapUiDialog::HandleDialogPageEventL( TInt aEventID )
-    {
-     CAknDialog::HandleDialogPageEventL( aEventID );
-         if( iExiting )
-             {        
-             // Exit requested. 
-             TryExitL( EAknCmdExit );
-             }   
-     }
-
-
-// ---------------------------------------------------------
-// CEapPeapUiDialog::ConfigureL
-// ---------------------------------------------------------
-//
-void CEapPeapUiDialog::ConfigureL( TBool aQuick )
-    {
-    RImplInfoPtrArray eapArray;
-    eapArray.Reset();
-
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, 
-                                        eapArray );
-    TInt itemIndex = iEapTypesListBox->CurrentItemIndex();    
-    TInt eapIndex( 0 );
-    for ( TInt i = 0; i < eapArray.Count(); i++ )
-        {
-        CImplementationInformation* tempInfo = eapArray[i];
-        if ( iUiEapTypes->At( itemIndex ).iEapType == 
-                                            tempInfo->DataType() )
-            {
-            eapIndex = i;
-            break;            
-            }
-        }        
-
-    CEapType* eapType;
-    eapType = CEapType::NewL( eapArray[eapIndex]->DataType(), 
-                              iIndexType, iIndex );
-    eapArray.ResetAndDestroy();
-    eapType->SetTunnelingType( KEapPeapId );
-    CleanupStack::PushL( eapType );
-    TInt buttonId = eapType->InvokeUiL();
-    CleanupStack::PopAndDestroy( eapType );
-
-    if ( buttonId == EAknCmdExit || buttonId == EEikCmdExit )
-        {
-        if (aQuick == EFalse)
-            {
-            TryExitL( buttonId );
-            }
-        else
-            {
-            iExiting = ETrue;
-            // Don't exit here. Framework command chain will
-            // cause a KERN-EXEC 3 panic. Handle the exit in 
-            // HandleDialogPageEventL(). 
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::PreLayoutDynInitL()
-    {
-    // Change title
-    ChangeTitleL( ETrue );
-    
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                    ControlOrNull( EPeapSettingsListbox ) );
-    iSettingListBox->SetComponentsToInheritVisibility( ETrue );
-
-    iEapTypesListBox = static_cast<CAknSingleNumberStyleListBox*>(
-                                ControlOrNull( EPeapSettingsEapTypeListbox ) );
-    iEapTypesListBox->SetComponentsToInheritVisibility( ETrue );
-
-    iCipherSuiteListBox = static_cast<CAknSingleNumberStyleListBox*>(
-                            ControlOrNull( EPeapSettingsCipherSuiteListbox ) );
-    iCipherSuiteListBox->SetComponentsToInheritVisibility( ETrue );
-    
-    // Get certificates before building the UI. 
-    // Will continue when certificates are received
-    iCertificates = iConnection->GetCertificateConnection( this );
-    User::LeaveIfError( iCertificates->Open() );
-    iCertificates->GetCertificates( &iUiUserCertificates, &iUiCACertificates );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::CompleteReadCertificates
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::CompleteReadCertificates( const TInt aResult )
-    {
-    if ( aResult == KErrNone ) // Certificates are received from core
-        {
-        TRAPD( err, CompleteUiConstructionL() );
-        if ( err != KErrNone )
-            {
-            TRAP_IGNORE( TryExitL( KErrCancel ) );        
-            }        
-        }
-    else
-        {
-        TRAP_IGNORE( TryExitL( KErrCancel ) );
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::CompleteUiConstructionL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::CompleteUiConstructionL()
-    {
-    // Initialize setting page 
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                    ControlOrNull( EPeapSettingsListbox ) );
-    iSettingListBox->SetMopParent( this );
-    iSettingListBox->CreateScrollBarFrameL( ETrue );
-    iSettingListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iSettingListBox->SetListBoxObserver( this );                                                                                                
-    DrawSettingsListL();
-
-    // Initialize EAP types page
-    iEapTypesListBox = static_cast<CAknSingleNumberStyleListBox*>(
-                                ControlOrNull( EPeapSettingsEapTypeListbox ) );
-    iEapTypesListBox->SetMopParent( this );
-    iEapTypesListBox->CreateScrollBarFrameL( ETrue );
-    iEapTypesListBox->ScrollBarFrame()->SetScrollBarVisibilityL(
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iEapTypesListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iEapTypesListBox->SetListBoxObserver( this );                                                    
-    
-    // Following deletes internal array created from resources. 
-    // To prevent memory leak.
-    MDesCArray* internalArray1 = iEapTypesListBox->Model()->ItemTextArray();
-    delete internalArray1;
-
-    // Initialize cipher suites page
-    iCipherSuiteListBox = static_cast<CAknSingleNumberStyleListBox*>(
-                            ControlOrNull( EPeapSettingsCipherSuiteListbox ) );
-    iCipherSuiteListBox->CreateScrollBarFrameL( ETrue );
-    iCipherSuiteListBox->ScrollBarFrame()->SetScrollBarVisibilityL(
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iCipherSuiteListBox->UpdateScrollBarsL();
-    iCipherSuiteListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iCipherSuiteListBox->SetListBoxObserver( this );     
-        
-    //Following deletes internal array created from resources. 
-    // To prevent memory leak.
-    MDesCArray* internalArray2 = iCipherSuiteListBox->Model()->ItemTextArray();
-    delete internalArray2;
-
-    SetEapIconsL();
-    DrawEapListL( 0 );
-
-    SetCipherIconsL();
-    DrawCipherSuitesL();
-    
-    iIsUIConstructionCompleted = ETrue;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::PostLayoutDynInitL()
-    {
-    TUid naviPaneUid;
-    naviPaneUid.iUid = EEikStatusPaneUidNavi;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( naviPaneUid );
-    if ( subPane.IsPresent()&&subPane.IsAppOwned() )
-        {
-        CAknNavigationControlContainer* naviPane = 
-                                static_cast<CAknNavigationControlContainer*>(
-                                        statusPane->ControlL( naviPaneUid ) );
-        CAknNavigationDecorator* naviDecorator = naviPane->ResourceDecorator();
-        if ( naviDecorator )
-            {
-            CAknTabGroup* tabGroup = static_cast<CAknTabGroup*>(
-                                        naviDecorator->DecoratedControl() );
-            tabGroup->SetActiveTabById( 0 ); 
-            tabGroup->SetTabFixedWidthL( KTabWidthWithOneTab );
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::ChangeTitleL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::ChangeTitleL( TBool aIsStarted )
-    {
-    TUid titlePaneUid;
-    titlePaneUid.iUid = EEikStatusPaneUidTitle;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( titlePaneUid );
-    
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        CAknTitlePane* titlePane = static_cast<CAknTitlePane*>(
-                                        statusPane->ControlL( titlePaneUid) );
-        if ( aIsStarted )
-            {
-            // Store previous application title text
-            const TDesC* prevText = titlePane->Text();    
-            iPreviousText = HBufC::NewL( prevText->Length() );
-            iPreviousText->Des().Append( *prevText );
-            TDesC* titleText = iEikonEnv->AllocReadResourceLC( 
-                                                    R_PEAP_SETTINGS_TITLE );
-            titlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText ); 
-            }
-        else
-            {
-            // Set calling application title text back
-            titlePane->SetTextL( *iPreviousText );    
-            }    
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CEapPeapUiDialog::OkToExitL( TInt aButtonId )
-    {
-    TBool ret( EFalse );
-    switch ( aButtonId )
-        {
-        case EEikBidOk:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                TPageIds index = static_cast<TPageIds>( ActivePageIndex() );
-                if ( index == ESettingsPage )
-                    {
-                    ShowSettingPageL( EFalse );
-                    }    
-                else if ( index == EEapTypePage )
-                    {
-                    ProcessCommandL( EPeapUiCmdConfigure );
-                    }    
-                }
-            else
-                {
-                #if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapPeapUiDialog::OkToExitL - UI not ready - Ignoring key press.\n") );
-				#endif
-                }
-                
-            break;
-            }
-
-        case EAknSoftkeyOptions:
-            {
-            DisplayMenuL();
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                iDataConnection->Update();
-                ChangeTitleL( EFalse );
-                ret = ETrue;
-                }
-            break;
-            }
-        
-        case EPeapUiCmdChange:
-            {
-            TInt pageId = ActivePageId();
-            if ( pageId == KEAPPEAPSETTINGSPAGE )
-                {
-                if( iIsUIConstructionCompleted )
-    				{
-        			ShowSettingPageL( EFalse );
-    				}
-    			else
-    			    {
-    				#if defined(_DEBUG) || defined(DEBUG)
-    				RDebug::Print(_L("CEapPeapUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-    				#endif
-    			    }
-                }
-            break;
-            }
-        case EPeapUiCmdConfigure:
-        case EPeapUiCmdEnable:
-        case EPeapUiCmdDisable:
-            {
-            ProcessCommandL( aButtonId );
-            ret = EFalse;
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-
-    if ( ret )
-        {
-        *iButtonId = aButtonId;
-        }
-
-    return ret;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::DrawSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::DrawSettingsListL()
-    {  
-    iSettingArray->Array()->ResetAndDestroy();
-    TInt ordinal = 0;
-    TInt activeUserCertificate = CheckActiveUserCertificate();
-	TBuf<KMaxFullCertLabelLength> aActiveuserCertificateName = KEmptyString();
-    if ( activeUserCertificate != KErrNotFound )
-        {
-		TBuf<KMaxFullCertLabelLength> text;
-		GetFullCertLabelL( 
-                iUiUserCertificates->At( activeUserCertificate ).iCertEntry,
-                text );
-		aActiveuserCertificateName.Copy( text );		
-        }
-    else
-        {
-        TDesC* notDefinedText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_PEAP_NOT_DEFINED );
-        aActiveuserCertificateName.Copy( *notDefinedText );
-        CleanupStack::PopAndDestroy( notDefinedText );
-        }
-
-    iSettingArray->AddTextItemL( aActiveuserCertificateName,
-                                 EPeapSettingUserCert,
-                                 R_PEAP_USER_CERT_STRING,
-                                 R_PEAP_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    TInt activeCaCertificate = CheckActiveCaCertificate();
-    TBuf<KMaxFullCertLabelLength> aActiveCaCertificateName = KEmptyString();
-    if ( activeCaCertificate != KErrNotFound )
-        {
-		TBuf<KMaxFullCertLabelLength> text;
-		GetFullCertLabelL(
-                    iUiCACertificates->At( activeCaCertificate ).iCertEntry,
-                    text );
-		aActiveCaCertificateName.Copy( text );				
-        }
-    else
-        {
-        TDesC* notDefinedText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_PEAP_NOT_DEFINED );
-        aActiveCaCertificateName.Copy( *notDefinedText );
-        CleanupStack::PopAndDestroy( notDefinedText );                
-        }
-
-    iSettingArray->AddTextItemL( aActiveCaCertificateName,
-                                 EPeapSettingCaCert,
-                                 R_PEAP_CA_CERT_STRING,
-                                 R_PEAP_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-      
-    iSettingArray->AddBinarySettingItemL( R_PEAP_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_PEAP_USERNAME_INUSESTRING, 
-                                          R_PEAP_USERNAME_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetUseManualUsername() );
-
-    iSettingArray->AddTextItemL( iUiData->GetManualUsername(),
-                                 EPeapTabSheetSettingsUsername,
-                                 R_PEAP_USERNAME_STRING,
-                                 R_PEAP_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    iSettingArray->AddBinarySettingItemL( R_PEAP_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_PEAP_REALM_INUSESTRING, 
-                                          R_PEAP_REALM_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetUseManualRealm() );    
-
-    iSettingArray->AddTextItemL( iUiData->GetManualRealm(),
-                                 EPeapTabSheetSettingsRealm,
-                                 R_PEAP_REALM_STRING,
-                                 R_PEAP_REALM_PAGE,
-                                 NULL,
-                                 ordinal++ );
-    
-    iSettingArray->AddBinarySettingItemL( R_PEAP_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_PEAP_TLS_PRIVACY_STRING, 
-                                          R_PEAP_TLS_PRIVACY_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetTlsPrivacy() );
-    
-
-    iSettingArray->AddBinarySettingItemL( R_PEAP_ALLOW_VERSION_0, 
-                                          R_PEAP_ALLOW_PEAPV0, 
-                                          R_PEAP_ALLOW_VERSION_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetAllowVersion0() );
-
-    iSettingArray->AddBinarySettingItemL( R_PEAP_ALLOW_VERSION_1, 
-                                          R_PEAP_ALLOW_PEAPV1, 
-                                          R_PEAP_ALLOW_VERSION_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetAllowVersion1() );
-                                
-    iSettingArray->AddBinarySettingItemL( R_PEAP_ALLOW_VERSION_2,
-                                          R_PEAP_ALLOW_PEAPV2, 
-                                          R_PEAP_ALLOW_VERSION_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetAllowVersion2() );
-
-    iSettingListBox->Model()->SetItemTextArray( iSettingArray->Array() );    
-    iSettingListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iSettingArray->Array()->RecalculateVisibleIndicesL();
-    iSettingListBox->HandleItemAdditionL();
-    iSettingListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::DynInitMenuPaneL( TInt aResourceId, 
-                                         CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aMenuPane && aResourceId == R_PEAP_MENU_PANE )
-        {
-        if ( !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-
-        TPageIds index = static_cast<TPageIds>( ActivePageIndex() );
-        if ( index == ESettingsPage )
-            {
-            aMenuPane->SetItemDimmed( EPeapUiCmdEnable,    ETrue );
-            aMenuPane->SetItemDimmed( EPeapUiCmdDisable,   ETrue );
-            aMenuPane->SetItemDimmed( EPeapUiCmdConfigure, ETrue );
-            aMenuPane->SetItemDimmed( EPeapUiCmdMoveUp,    ETrue );
-            aMenuPane->SetItemDimmed( EPeapUiCmdMoveDown,  ETrue );
-            }
-        else if ( index == EEapTypePage )
-            {
-            aMenuPane->SetItemDimmed( EPeapUiCmdChange, ETrue );
-
-            if ( iEapTypeViewArray->Count() > 0 )
-                {
-                TInt currentIndex = iEapTypesListBox->CurrentItemIndex();
-                TBool enabled = iUiEapTypes->At( currentIndex ).iIsEnabled;
-
-                // Hide either "Enable" or "Disable", as appropriate.
-                aMenuPane->SetItemDimmed( EPeapUiCmdEnable,  enabled );
-                aMenuPane->SetItemDimmed( EPeapUiCmdDisable, !enabled );
-
-                // Don't display "Configure" for disabled items
-                aMenuPane->SetItemDimmed( EPeapUiCmdConfigure, !enabled );
-
-                // Don't display "Raise priority" nor "Lower priority" for 
-                // disabled items
-                aMenuPane->SetItemDimmed( EPeapUiCmdMoveUp, !enabled );
-                aMenuPane->SetItemDimmed( EPeapUiCmdMoveDown, !enabled );
-
-                if ( enabled )
-                    {
-                    
-                    if ( currentIndex == 0 )
-                        {
-                        // Can't go higher than top.
-                        aMenuPane->SetItemDimmed( EPeapUiCmdMoveUp, ETrue );
-                        }
-                    
-                    if ( currentIndex == iEapTypeViewArray->Count()-1 ||
-                         ( currentIndex < iEapTypeViewArray->Count()-1 && 
-                         !iUiEapTypes->At( currentIndex + 1 ).iIsEnabled ) ) 
-                        {
-                        // Can't go lower than the last enabled item
-                        aMenuPane->SetItemDimmed( EPeapUiCmdMoveDown, ETrue );
-                        }
-
-                    }
-
-                }
-            else
-                {
-                aMenuPane->SetItemDimmed( EPeapUiCmdEnable,    ETrue );
-                aMenuPane->SetItemDimmed( EPeapUiCmdDisable,   ETrue );
-                aMenuPane->SetItemDimmed( EPeapUiCmdConfigure, ETrue );
-                aMenuPane->SetItemDimmed( EPeapUiCmdMoveUp,    ETrue );
-                aMenuPane->SetItemDimmed( EPeapUiCmdMoveDown,  ETrue );
-                aMenuPane->SetItemDimmed( EPeapUiCmdChange,    ETrue );
-                }
-            }
-        else if ( index == ECipherSuitePage )
-            {
-            aMenuPane->SetItemDimmed( EPeapUiCmdConfigure, ETrue );
-            aMenuPane->SetItemDimmed( EPeapUiCmdMoveUp,    ETrue );
-            aMenuPane->SetItemDimmed( EPeapUiCmdMoveDown,  ETrue );
-            aMenuPane->SetItemDimmed( EPeapUiCmdChange,    ETrue );
-
-            if ( iCipherSuitesViewArray->Count() > 0 )
-                {
-                TInt currIndex = iCipherSuiteListBox->CurrentItemIndex();
-                TBool enabled = iUiCipherSuites->At( currIndex ).iIsEnabled;
-
-                // Hide either "Enable" or "Disable", as appropriate.
-                aMenuPane->SetItemDimmed( EPeapUiCmdEnable,  enabled );
-                aMenuPane->SetItemDimmed( EPeapUiCmdDisable, !enabled );
-                }
-            else
-                {
-                aMenuPane->SetItemDimmed( EPeapUiCmdEnable,  ETrue );
-                aMenuPane->SetItemDimmed( EPeapUiCmdDisable, ETrue );
-                }
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::ProcessCommandL( TInt aCommand )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    TPageIds pageIndex = static_cast<TPageIds>( ActivePageIndex() );
-    switch( aCommand )
-        {
-        case EAknCmdExit:
-            {
-            TryExitL( aCommand );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case EPeapUiCmdChange:
-            {
-            if ( pageIndex == ESettingsPage )
-                {
-                if( iIsUIConstructionCompleted )
-    				{
-        			ShowSettingPageL( ETrue );
-    				}
-    			else
-    			    {
-    				#if defined(_DEBUG) || defined(DEBUG)
-    				RDebug::Print(_L("CEapPeapUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-    				#endif
-    			    }
-                }
-            break;
-            }
-
-        case EPeapUiCmdMoveUp:
-            {
-            if ( pageIndex == EEapTypePage )
-                {
-                TInt cur = iEapTypesListBox->CurrentItemIndex();
-                MoveEapTypeL( cur, cur - 1 );
-                }
-            break;
-            }
-
-        case EPeapUiCmdMoveDown:
-            {
-            if ( pageIndex == EEapTypePage )
-                {
-                TInt cur = iEapTypesListBox->CurrentItemIndex();
-                MoveEapTypeL( cur, cur + 1 );
-                }
-            break;
-            }
-
-        case EPeapUiCmdEnable:
-            {
-            if ( pageIndex == ECipherSuitePage )
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                iUiCipherSuites->At( index ).iIsEnabled = ETrue;
-                iCipherSuites->Update();
-                DrawCipherSuitesL();
-                CEikButtonGroupContainer& cba = ButtonGroupContainer();
-                cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-                cba.DrawDeferred();
-                }
-            else if ( pageIndex == EEapTypePage )
-                {
-                TInt cur = iEapTypesListBox->CurrentItemIndex();
-                iUiEapTypes->At( cur ).iIsEnabled = ETrue;
-
-                iEapTypes->Update();                
-
-                // enabling moves item to the top of the list
-                MoveEapTypeL( cur, 0 );                
-
-                // load the new CBA from resource
-                CEikButtonGroupContainer& cba = ButtonGroupContainer();                
-                cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_CONFIGURE );
-                cba.DrawDeferred();
-                }                
-            break;
-            }
-
-        case EPeapUiCmdDisable:
-            {
-            if ( pageIndex == ECipherSuitePage )
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                iUiCipherSuites->At( index ).iIsEnabled = EFalse;
-                iCipherSuites->Update();
-                DrawCipherSuitesL();
-                CEikButtonGroupContainer& cba = ButtonGroupContainer();
-                cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                cba.DrawDeferred();
-                }            
-            else if ( pageIndex == EEapTypePage )
-                {
-                TInt itemIndex = iEapTypesListBox->CurrentItemIndex();
-                
-                if( GetEnabledEapTypeCount() > KMinEnabledCount )
-                    {
-                    // disabling moves item just after the last enabled one,
-                    // so find that position
-                    TInt next = itemIndex;
-                    
-                    while ( next < iUiEapTypes->Count() - 1 && 
-                            iUiEapTypes->At( next ).iIsEnabled )
-                        {
-                        ++next;
-                        }
-
-                    if ( next > itemIndex && 
-                         !iUiEapTypes->At( next ).iIsEnabled ) 
-                        {
-                        --next;
-                        }
-
-
-                    iUiEapTypes->At( itemIndex ).iIsEnabled = EFalse;
-
-                    // move item if needed
-                    MoveEapTypeL( itemIndex, next );
-                    iEapTypes->Update();                
-
-                    // Highlight follows movement.
-                    //iEapTypesListBox->SetCurrentItemIndex( next );
-                    
-                    // load the new CBA from resource
-                    CEikButtonGroupContainer& cba = ButtonGroupContainer();
-                    cba.SetCommandSetL( 
-                                     R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                    
-                    cba.DrawDeferred();
-                    }
-                else
-                    {
-                    HBufC* stringLabel;
-                    stringLabel = StringLoader::LoadL(
-                                R_PEAP_INFO_CANNOT_DISABLE_ALL_EAP_PLUGINS,
-                                                       iEikonEnv );
-                    CleanupStack::PushL( stringLabel );
-                    CAknInformationNote* dialog = new ( ELeave )
-                                                CAknInformationNote( ETrue );
-                    dialog->ExecuteLD( *stringLabel );
-                    CleanupStack::PopAndDestroy( stringLabel );
-                    }
-                }
-            break;
-            }
-            
-        case EPeapUiCmdConfigure:
-            {
-            if ( pageIndex == EEapTypePage )
-                {
-                ConfigureL(EFalse);
-                }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::PageChangedL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::PageChangedL( TInt aPageId )
-    {
-    if ( !iIsUIConstructionCompleted )
-        {
-        return;
-        }
-        
-    if ( aPageId == KEAPPEAPSETTINGSPAGE )
-				{
-        if (iSettingListBox->ScrollBarFrame())
-            {
-            iSettingListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(ETrue);
-            }
-        if (iEapTypesListBox->ScrollBarFrame())
-            {
-            iEapTypesListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iCipherSuiteListBox->ScrollBarFrame())
-            {
-            iCipherSuiteListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        }
-     else if ( aPageId == KEAPPEAPEAPPAGE )
-        {
-        if (iSettingListBox->ScrollBarFrame())
-            {
-            iSettingListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iEapTypesListBox->ScrollBarFrame())
-            {
-            iEapTypesListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(ETrue);
-            }
-        if (iCipherSuiteListBox->ScrollBarFrame())
-            {
-            iCipherSuiteListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        }
-    else if ( aPageId == KEAPPEAPCIPHERPAGE )
-        {
-        if (iSettingListBox->ScrollBarFrame())
-            {
-            iSettingListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iEapTypesListBox->ScrollBarFrame())
-            {
-            iEapTypesListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iCipherSuiteListBox->ScrollBarFrame())
-            {
-            iCipherSuiteListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(ETrue);
-            }
-        }
-        
-    CEikButtonGroupContainer& cba = ButtonGroupContainer();
-    if( aPageId == KEAPPEAPSETTINGSPAGE )
-        {
-        cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_EDIT );
-        }
-    else if( aPageId == KEAPPEAPEAPPAGE )
-        {
-        TInt index = iEapTypesListBox->CurrentItemIndex();
-        if ( ( *iUiEapTypes )[index].iIsEnabled )
-            {
-            cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_CONFIGURE );    
-            }
-        else
-            {
-            cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-            }
-        
-        }
-    else if( aPageId == KEAPPEAPCIPHERPAGE )
-        {
-        TInt index = iCipherSuiteListBox->CurrentItemIndex();
-        if( ( *iUiCipherSuites )[ index ].iIsEnabled )
-            {
-            cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-            }
-        else
-            {
-            cba.SetCommandSetL( R_PEAP_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-            }
-        }
-    cba.DrawDeferred();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::ShowSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::ShowSettingPageL( TInt aCalledFromMenu ) 
-    {
-    TInt index = iSettingListBox->CurrentItemIndex();
-    if ( index == EUserCertificateItem )
-        {
-        TInt activeUserCertificate = CheckActiveUserCertificate();
-        CDesCArrayFlat* tempArray = new( ELeave )CDesCArrayFlat( 
-                                                KCertificateArrayGranularity );
-        CleanupStack::PushL( tempArray );
-
-        TDesC* noneText = iEikonEnv->AllocReadResourceLC( 
-                                                    R_PEAP_NONE_SELECTION );
-        tempArray->InsertL( 0, *noneText );
-        CleanupStack::PopAndDestroy( noneText );
-
-        for ( TInt i = 0; i < iUiUserCertificates->Count(); i++ )
-            {
-            TEapTlsPeapUiCertificate certificate = 
-                                                iUiUserCertificates->At( i );
-            SCertEntry entry = certificate.iCertEntry;
-			TBuf<KMaxFullCertLabelLength> text;
-			GetFullCertLabelL( entry, text);
-			tempArray->InsertL( i+1, text );
-            }
-
-        TInt selected( 0 );    
-        if ( activeUserCertificate == KErrNotFound )
-            {
-            selected = ShowRadioButtonSettingPageL( R_PEAP_USER_CERT_STRING, 
-                                                    tempArray, 0 );
-            }
-        else 
-            {
-            selected = ShowRadioButtonSettingPageL( R_PEAP_USER_CERT_STRING, 
-                                                    tempArray, 
-                                                    activeUserCertificate+1 );
-                                    //Plus 1 cause we added 'none' selection
-            }
-
-        CleanupStack::PopAndDestroy( tempArray );
-        UserCertificateHouseKeeping( selected );    
-        iCertificates->Update();
-        DrawSettingsListL(); // List must be drawn again at this stage
-        }
-    else if ( index == ECaCertificateItem )
-        {
-        TInt activeCaCertificate = CheckActiveCaCertificate();
-
-        CDesCArrayFlat* tempArray = new( ELeave )CDesCArrayFlat( 
-                                                KCertificateArrayGranularity );
-        CleanupStack::PushL( tempArray);
-
-        TDesC* noneText = iEikonEnv->AllocReadResourceLC( 
-                                                    R_PEAP_NONE_SELECTION );
-        tempArray->InsertL( 0, *noneText);
-        CleanupStack::PopAndDestroy( noneText);
-
-        for ( TInt i = 0; i < iUiCACertificates->Count(); i++ )
-            {
-            TEapTlsPeapUiCertificate certificate = iUiCACertificates->At( i );
-            SCertEntry entry = certificate.iCertEntry;
-            TBuf<KMaxFullCertLabelLength> text;
-			GetFullCertLabelL( entry, text );
-			tempArray->InsertL( i+1, text );
-            }
-
-        TInt selected( 0 );
-        if ( activeCaCertificate == KErrNotFound )
-            {
-            selected = ShowRadioButtonSettingPageL( R_PEAP_CA_CERT_STRING, 
-                                                    tempArray, 0 );
-            }
-        else
-            {
-            selected = ShowRadioButtonSettingPageL( R_PEAP_CA_CERT_STRING, 
-                                                    tempArray, 
-                                                    activeCaCertificate+1 ); 
-                                    //Plus 1 cause we added 'none' selection
-            }
-        CleanupStack::PopAndDestroy( tempArray );
-        CaCertificateHouseKeeping( selected );
-        iCertificates->Update();
-        DrawSettingsListL(); // List must be drawn again at this stage
-        }
-    else
-        {
-        CAknSettingItem* item = iSettingArray->Array()->At( index );
-        item->EditItemL( aCalledFromMenu );
-        item->StoreL();
-        }
-
-    DrawNow();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::MoveEapTypeL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::MoveEapTypeL( TInt aOldPos, TInt aNewPos )
-    {
-    TEapTlsPeapUiEapType originalUpper = iUiEapTypes->At( aOldPos );
-    iUiEapTypes->Delete( aOldPos );
-    iUiEapTypes->InsertL( aNewPos, originalUpper );
-    iUiEapTypes->Compress();    // Might not be needed
-    iEapTypes->Update();
-    DrawEapListL( aNewPos );
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::DrawEapListL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::DrawEapListL( TInt aWantedIndex )
-    {    
-    iEapTypeViewArray->Reset();
-
-    RImplInfoPtrArray eapArray;
-    eapArray.Reset();
-
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, eapArray );
-    for ( TInt i = 0; i < iUiEapTypes->Count(); i++ )
-        {
-        TBuf<KMaxLengthOfEapLine> tempLine;
-        
-        if ( iUiEapTypes->At( i ).iIsEnabled )
-            {
-            _LIT( KNumTab, "%d\t" );
-            tempLine.AppendFormat( KNumTab, i+1 );
-            }
-        else
-            {
-            _LIT( KTab, "\t" );
-            tempLine.Append( KTab );
-            }
-        
-        for ( TInt index = 0; index < eapArray.Count(); index++ )
-            {
-            TBuf8<100> egyik( eapArray[index]->DataType() );
-            TBuf8<100> masik( iUiEapTypes->At( i ).iEapType );
-            if ( eapArray[index]->DataType() == iUiEapTypes->At( i ).iEapType )
-                {
-                tempLine.Append( eapArray[ index ]->DisplayName() );
-                break;
-                }
-            }
-        if ( iUiEapTypes->At( i ).iIsEnabled )
-            {   // Add mark icon to indicate that the eap type is enabled
-            _LIT( KTab0, "\t0" );
-            tempLine.Append( KTab0 );
-            }
-        iEapTypeViewArray->InsertL( i, tempLine );
-        }
-
-    eapArray.ResetAndDestroy();
-    iEapTypesListBox->Model()->SetItemTextArray( iEapTypeViewArray );
-    iEapTypesListBox->HandleItemAdditionL();
-    iEapTypesListBox->SetCurrentItemIndex( aWantedIndex );
-    iEapTypesListBox->DrawDeferred();
-    iEapTypesListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::ShowRadioButtonSettingPageL
-// -----------------------------------------------------------------------------
-//
-TInt CEapPeapUiDialog::ShowRadioButtonSettingPageL( TInt aTitle, 
-                                                    CDesCArrayFlat* aValues,
-                                                    TInt aCurrentItem )
-    {
-    // title of the dialog
-    HBufC* title = iCoeEnv->AllocReadResourceLC( aTitle );
-    // We have everything to create dialog
-    CAknRadioButtonSettingPage* dlg = new( ELeave )CAknRadioButtonSettingPage(
-                                                R_RADIO_BUTTON_SETTING_PAGE,
-                                                aCurrentItem, 
-                                                aValues );
-    CleanupStack::PushL( dlg );
-    dlg->SetSettingTextL( *title ); 
-    CleanupStack::Pop( dlg ); 
-    dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged );
-    CleanupStack::PopAndDestroy( title ); 
-    // index must be re-turned upside down, because options list is upside down
-    return aCurrentItem;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::DrawCipherSuitesL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::DrawCipherSuitesL()
-    {
-    iCipherSuitesViewArray->Reset();
-    TInt listCount( 0 );
-    TBuf<KMaxLengthOfSuiteName> temp;
-    for ( TInt i = 0; i < iUiCipherSuites->Count(); i++ )
-        {
-        temp.Zero();
-        _LIT( KTab, "\t" );
-        temp.Append( KTab ); 
-        TEapTlsPeapUiCipherSuite suite = iUiCipherSuites->At( i );
-        TUint32 suiteId = suite.iCipherSuite;
-        switch ( suiteId )
-            {
-            case 0x0004:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_PEAP_SUITE_RSARC4MD5 );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x0005:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_PEAP_SUITE_RSARC4SHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x000a:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_PEAP_SUITE_RSA3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x0016:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_PEAP_SUITE_DHERSA3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );            
-                break;
-                }
-
-            case 0x0013:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_PEAP_SUITE_DHEDSS3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );        
-                break;
-                }
-
-            case 0x002F:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_PEAP_SUITE_RSAAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );                
-                break;
-                }
-
-            case 0x0032:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_PEAP_SUITE_DHERSAAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x0033:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_PEAP_SUITE_DHEDSSAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );                     
-                break;
-                }
-
-            default:
-                {
-                temp.Append( KEmptyString );                                    
-                break;
-                }
-            }
-
-        if ( iUiCipherSuites->At( i ).iIsEnabled )
-            {   // Add mark icon to indicate that the suite is enabled
-            _LIT( KTab0, "\t0" );
-            temp.Append( KTab0 );
-            }
-
-        iCipherSuitesViewArray->InsertL( listCount, temp );
-        listCount++;                
-        }
-
-    iCipherSuiteListBox->Model()->SetItemTextArray( iCipherSuitesViewArray );
-    iCipherSuiteListBox->HandleItemAdditionL();
-    iCipherSuiteListBox->DrawDeferred();
-    iCipherSuiteListBox->UpdateScrollBarsL();        
-}
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::CheckActiveUserCertificate
-// -----------------------------------------------------------------------------
-//
-TInt CEapPeapUiDialog::CheckActiveUserCertificate()
-    {
-    for ( TInt i = 0; i < iUiUserCertificates->Count(); i++ )
-        {
-        if ( iUiUserCertificates->At( i ).iIsEnabled )
-            {
-            return i;
-            }
-        }
-
-    return KErrNotFound;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::CheckActiveCaCertificate
-// -----------------------------------------------------------------------------
-//
-TInt CEapPeapUiDialog::CheckActiveCaCertificate()
-    {
-    for ( TInt i = 0; i<iUiCACertificates->Count(); i++ )
-        {
-        if ( iUiCACertificates->At( i ).iIsEnabled )
-            {
-            return i;
-            }
-        }
-
-    return KErrNotFound;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::UserCertificateHouseKeeping
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::UserCertificateHouseKeeping( TInt aSelected )
-    {
-    for ( TInt i = 0; i < iUiUserCertificates->Count(); i++ )
-        {
-        iUiUserCertificates->At( i ).iIsEnabled = EFalse;
-        }
-
-    if ( aSelected != 0 )   // Zero index is none
-        {
-        iUiUserCertificates->At( aSelected-1 ).iIsEnabled = ETrue;
-        } 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::CaCertificateHouseKeeping
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::CaCertificateHouseKeeping( TInt aSelected )
-    {
-    for ( TInt i = 0; i<iUiCACertificates->Count() ; i++ )
-        {
-        iUiCACertificates->At( i ).iIsEnabled = EFalse;
-        }
-
-    if ( aSelected != 0 )   // Zero index is none
-        {        
-        iUiCACertificates->At( aSelected-1 ).iIsEnabled = ETrue;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::CreateEapTypeDataBaseL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::CreateEapTypeDataBaseL()
-    {
-    RImplInfoPtrArray eapArray;
-    eapArray.Reset();
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, eapArray );
-    TInt allowedInPeapCount( 0 );
-    for ( TInt i = 0; i < eapArray.Count(); i++ )
-        {
-        if ( !CEapType::IsDisallowedInsidePEAP( *eapArray[i] ) )
-            {
-            CImplementationInformation* info = eapArray[i];
-            TEapTlsPeapUiEapType tempEapType;
-            tempEapType.iEapType = info->DataType();
-            
-            // MNOL-6RNHEX
-            // Only EAP-SIM and EAP-AKA should be enabled, in that order
-
-            // BINARY RESOURCE DATA
-            
-            // [FE] [00 00 00] [TEapType_bigendian]
-            _LIT8( KExpEapFirstQuad, "\xFE\0\0\0" );
-            TPtrC8 firstQuad( tempEapType.iEapType.Ptr(), 4 );
-            // TUint32 dataType = BigEndian::Get32( tempEapType.iEapType.Ptr()+4 );
-
-            TUint32 dataType = ( tempEapType.iEapType[4] << 24 ) |
-                               ( tempEapType.iEapType[5] << 16 ) |
-                               ( tempEapType.iEapType[6] << 8 ) |
-                               tempEapType.iEapType[7];
-    
-            if ( !firstQuad.Compare( KExpEapFirstQuad ) && 
-                 ( dataType == EAPSettings::EEapSim || 
-                   dataType == EAPSettings::EEapAka ) )
-                {
-                tempEapType.iIsEnabled = ETrue;
-                iUiEapTypes->InsertL( KFirstElement, tempEapType );
-                }
-            else
-                {
-                tempEapType.iIsEnabled = EFalse;
-                iUiEapTypes->InsertL( allowedInPeapCount, tempEapType );
-                }
-
-            allowedInPeapCount++;
-            }
-        }
-    
-    __ASSERT_DEBUG( iUiEapTypes->Count() >= 2, User::Panic( _L("EAP-SIM/AKA missing"), 1) );
-
-    // Check if EAP-SIM and EAP-AKA are in correct order
-
-    // BINARY RESOURCE DATA
-    
-    const TDesC8& firstEap = iUiEapTypes->At( KFirstElement ).iEapType;
-    const TDesC8& secondEap = iUiEapTypes->At( KSecondElement ).iEapType;
-    
-    TUint32 dataTypeFirst = ( firstEap[4] << 24 ) |
-                            ( firstEap[5] << 16 ) |
-                            ( firstEap[6] << 8 ) |
-                            firstEap[7];
-    TUint32 dataTypeSecond = ( secondEap[4] << 24 ) |
-                             ( secondEap[5] << 16 ) |
-                             ( secondEap[6] << 8 ) |
-                             secondEap[7];
-
-    // If not, switch them
-    if ( dataTypeFirst == EAPSettings::EEapAka &&
-        dataTypeSecond == EAPSettings::EEapSim )
-        {
-        TEapTlsPeapUiEapType tempEapType = iUiEapTypes->At( KFirstElement );
-        iUiEapTypes->Delete( KFirstElement );
-        iUiEapTypes->InsertL( KSecondElement, tempEapType );
-        }
-
-    iEapTypes->Update();        
-    eapArray.ResetAndDestroy();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::SetCipherIconsL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::SetCipherIconsL()
-    {
-    CArrayPtr< CGulIcon >* icons = new( ELeave ) CAknIconArray( 1 );
-    CleanupStack::PushL( icons );
-
-    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-
-/*    icons->AppendL( AknsUtils::CreateGulIconL( skinInstance, 
-                                        KAknsIIDQgnIndiMarkedAdd,
-                                        AknIconUtils::AvkonIconFileName(),
-                                        EMbmAvkonQgn_indi_marked_add, 
-                                        EMbmAvkonQgn_indi_marked_add_mask ) );
-*/
-
-    CGulIcon* icon = CGulIcon::NewLC();
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* mask = NULL;    
-    AknsUtils::CreateColorIconL( skinInstance,
-                                 KAknsIIDQgnIndiMarkedAdd, 
-                                 KAknsIIDQsnIconColors, 
-                                 EAknsCIQsnIconColorsCG13, 
-                                 bitmap, 
-                                 mask, 
-                                 AknIconUtils::AvkonIconFileName(),
-                                 EMbmAvkonQgn_indi_marked_add, 
-                                 EMbmAvkonQgn_indi_marked_add_mask,
-                                 KRgbBlack );
-    icon->SetBitmap( bitmap );
-    icon->SetMask( mask );    
-    icons->AppendL( icon );
-                
-    CleanupStack::Pop( icon ); 
-    CleanupStack::Pop( icons ); 
-
-    iCipherSuiteListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::SetEapIconsL
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::SetEapIconsL()
-    {
-    CArrayPtr< CGulIcon >* icons = new( ELeave ) CAknIconArray( 1 );
-    CleanupStack::PushL( icons );
-
-    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-
-/*    icons->AppendL( AknsUtils::CreateGulIconL( skinInstance, 
-                                        KAknsIIDQgnIndiMarkedAdd,
-                                        AknIconUtils::AvkonIconFileName(),
-                                        EMbmAvkonQgn_indi_marked_add, 
-                                        EMbmAvkonQgn_indi_marked_add_mask ) );
-*/
-
-    CGulIcon* icon = CGulIcon::NewLC();
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* mask = NULL;    
-    AknsUtils::CreateColorIconL( skinInstance,
-                                 KAknsIIDQgnIndiMarkedAdd, 
-                                 KAknsIIDQsnIconColors, 
-                                 EAknsCIQsnIconColorsCG13, 
-                                 bitmap, 
-                                 mask, 
-                                 AknIconUtils::AvkonIconFileName(),
-                                 EMbmAvkonQgn_indi_marked_add, 
-                                 EMbmAvkonQgn_indi_marked_add_mask,
-                                 KRgbBlack );
-    icon->SetBitmap( bitmap );
-    icon->SetMask( mask );    
-    icons->AppendL( icon );
-                
-    CleanupStack::Pop( icon ); 
-    CleanupStack::Pop( icons ); 
-
-    iEapTypesListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::GetEnabledEapTypeCount
-// -----------------------------------------------------------------------------
-//
-TUint CEapPeapUiDialog::GetEnabledEapTypeCount()
-    {
-    TUint itemCount( 0 );
-    for( TInt i( 0 ); i < iUiEapTypes->Count(); ++i )
-        {
-        if( iUiEapTypes->At( i ).iIsEnabled )
-            {
-            ++itemCount;
-            }
-        }
-    return itemCount;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CEapPeapUiDialog::GetHelpContext(TCoeHelpContext& /* aContext */) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-
-
-void CEapPeapUiDialog::GetFullCertLabelL( const SCertEntry& aCert, 
-                                         TDes& aFullLabel )
-    {
-    TInt length = 0;
-
-	// For label.
-    length += aCert.iLabel.Length();
-
-	// For separator between label and primary name.    
-    length += KNameSeparator.iTypeLength;    
-    
-    // For primary name.
-    length += aCert.iPrimaryName.Length();
-
-    if ( !( aCert.iLabel.Length() ) )
-        {	
-    	// For secondary name.
-	    length += aCert.iSecondaryName.Length();
-        }
-    
-    if( length > aFullLabel.MaxLength() )
-        {
-#if defined(_DEBUG) || defined(DEBUG)
-		RDebug::Print(_L("CEapTtlsUiDialog::GetFullCertLabel - ERROR! Length Mismatch in Certificate's full name\n") );
-#endif
-        }
-
-    HBufC* label = HBufC::NewL( length );
-    label->Des().Append( aCert.iLabel );
-
-    label->Des().Append( KNameSeparator );
-    label->Des().Append( aCert.iPrimaryName );
-
-    if ( !( aCert.iLabel.Length() ) )
-        {
-    	// Secondary name, only if no label. Certificate manager does the same way.
-	    label->Des().Append( aCert.iSecondaryName );
-        }
-            
-	aFullLabel.Copy( label->Des().Left( aFullLabel.MaxLength() ) );   
-    
-    delete label;
-    label = NULL;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/data/102072bb.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: ECom resource definition for EAPPluginConfiguration.
-*
-*/
-
-/*
-* %version: 12 %
-*/
-
-//  INCLUDES
-#include <ecom/registryinfo.rh>
-#include "EAPPluginConfigUid.h"
-
-
-//  RESOURCE DEFINITIONS 
-
-// ---------------------------------------------------------------------------
-//   
-//    theInfo
-//    Contains the ECom registration information for EAP Plugin Configuration
-//
-// ---------------------------------------------------------------------------
-//
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid = EAP_PLUGIN_CONFIG_DLL_UID;
-    interfaces = 
-        {
-        INTERFACE_INFO
-		    {		
-            interface_uid = EAP_PLUGIN_CONFIG_INTERFACE_UID;
-            implementations = 
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid = EAP_PLUGIN_CONFIG_IMPLEMENTATION_UID;
-                    version_no = 1;
-                    display_name = EAP_PL_CONFIG_NAME;
-                    default_data = "EAPPConfig";
-                    opaque_data = "";
-                    }         
-                };
-            }
-	    };
-    }
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/data/EAPPluginConfigRes.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI resources for the EAPPluginConfig module.
-*
-*/
-
-/*
-* %version: 17 %
-*/
-
-CHARACTER_SET   UTF8
-
-//  INCLUDES
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.rh>
-#include <avkon.rsg>
-
-#include "EAPPluginConfig.hrh"
-#include <wlaneapsettingsui.loc>
-#include <avkon.loc>
-
-
-//  RESOURCE IDENTIFIER
-NAME EPCG
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF { buf = "EAPPluginConfiguration"; }
-
-
-RESOURCE MENU_BAR r_wpa_eap_plugin_menubar
-    {
-    titles =
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_wpa_eap_plugin_menu;
-            }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_wpa_eap_plugin_menu
-    {
-    items =
-        {
-        MENU_ITEM 
-            { 
-            command = EWPAEAPPluginCmdConfigure; 
-            txt = qtn_wlan_options_eap_plugin_configure;
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EWPAEAPPluginCmdEnable; 
-            txt = qtn_wlan_options_eap_plugin_enable; 
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EWPAEAPPluginCmdDisable; 
-            txt = qtn_wlan_options_eap_plugin_disable; 
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EWPAEAPPluginCmdPriorityUp; 
-            txt = qtn_wlan_options_eap_plugin_priority_up; 
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EWPAEAPPluginCmdPriorityDown; 
-            txt = qtn_wlan_options_eap_plugin_priority_down; 
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt = qtn_options_help; 
-            },
-
-        MENU_ITEM
-            {
-            command = EAknCmdExit;
-            txt = qtn_options_exit;
-            }
-        };
-    }
-
-
-RESOURCE CBA r_wpa_eap_config_softkeys_options_back_configure
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EWPAEAPPluginCmdConfigure; txt = \
-                                            qtn_msk_wlan_eap_configure; }
-        };
-    }
-    
-
-RESOURCE CBA r_wpa_eap_config_softkeys_options_back_enable
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EWPAEAPPluginCmdEnable; txt = \
-                                            qtn_msk_wlan_eap_cs_enable; }
-        };
-    }
-
-
-RESOURCE DIALOG r_wpa_eap_config_dialog
-    {
-    flags = EAknDialogSelectionList;
-    buttons = r_wpa_eap_config_softkeys_options_back_configure;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtSingleNumberListBox;
-            id = ESelectionListControl;
-            control = LISTBOX
-                {
-                flags = EAknListBoxSelectionList;
-                };
-            }
-        };
-    }
-
-
-RESOURCE TBUF r_info_cannot_disable
-    {
-    buf = qtn_wlan_info_cannot_disable_all_eap_plugins;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPlugInConfigurationDlg.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares dialog
-*
-*/
-
-/*
-* %version: 17 %
-*/
-
-#ifndef __EAPPLUGINCONFIGURATIONDLG_H__
-#define __EAPPLUGINCONFIGURATIONDLG_H__
-
-
-// INCLUDES
-#include <aknselectionlist.h>
-#include <commdb.h>
-
-#include "EAPPluginList.h"
-
-
-// FORWARD DECLARATIONS
-class CAknTitlePane;
-class CEAPPluginConfigurationModel;
-
-
-// CONSTANTS
-/**
-* Maximum length of a SSID in BYTES
-*/
-const TUint8 KMaxSSIDLength = 32;
-
-
-// CLASS DECLARATION
-/**
-* CEAPPluginConfigurationDlg dialog class
-*/
-class CEAPPluginConfigurationDlg : public CAknSelectionListDialog
-    {
-    public: // Constructors and destructor
-
-        /**
-        * Constructor.
-        * @param aButtonId Button used to close the dialog
-        * @param aModel UI model.
-        */
-        CEAPPluginConfigurationDlg( TInt& aButtonId,
-                                 CEAPPluginConfigurationModel& aModel,
-                                 const TUint32 iIapId );
-        /**
-        * Create and launch dialog.
-        * @param aPlugins   Plugin list
-        * @param aTitle Title of the dialog
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( const REAPPluginList& aPlugins,
-                                const TDesC& aTitle );
-
-
-        /**
-        * Destructor.
-        */
-        ~CEAPPluginConfigurationDlg();
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-
-
-    private:
-
-        /**
-        * This function is called by the dialog framework before the dialog is 
-        * sized and laid out.
-        */
-        virtual void PreLayoutDynInitL();
-
-
-        /**
-        * Handles a dialog button press for the specified button 
-        * @param aButtonId  The ID of the button that was activated.
-        * @return   ETrue to validate and exit the dialog, 
-        *           EFalse to keep the dialog active
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-
-        /**
-        * Processes user commands.
-        * @param aCommandId ID of the command to respond to. 
-        */
-        virtual void ProcessCommandL( TInt aCommandId );
-
-
-        /**
-        * Get help context.
-        * @param aContext Help context is returned here.
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param aMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-
-        /**
-        * Catch offered key events.
-        * @param aKeyEvent Key event
-        * @param aModifiers Modifiers
-        * @return EKeyWasConsumed or EKeyWasNotConsumed, appropriately.
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, 
-                                     TEventCode aModifiers );
-
-        void SetIconsL();
-        void HandleResourceChange( TInt aType );
-        
-        /**
-        * @see CEikDialog
-        */
-        void HandleDialogPageEventL( TInt aEventID );
-        
-        void ConfigureL( TBool aQuick );
-
-    private: //data
-
-        // Stores the name of the connection, to be showed as the title.
-        TBuf<KMaxSSIDLength> iConnectionName;
-
-        // Title pane. Not owned.
-        CAknTitlePane* iTitlePane;
-
-        // Pointer to the old title. Owned.
-        HBufC* iOldTitleText;
-
-        REAPPluginList iPlugins;
-        
-        TInt* iButtonId;
-
-        // For base class, unused.
-        TInt iDummy;
-
-        // UI model. Not owned.
-        CEAPPluginConfigurationModel* iModel;
-        
-        TUint32 iIapId;
-        
-        // For exiting dialog
-        TBool iExiting;
-        
-    };
-
-
-#endif      // __EAPPLUGINCONFIGURATIONDLG_H__
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfig.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP Plugin Configuration UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _EAPPLUGINCONFIG_HRH_
-#define _EAPPLUGINCONFIG_HRH_
-
-enum TEapPluginConfigMenuCommands
-    {
-    EWPAEAPPluginCmdConfigure = 1000,
-    EWPAEAPPluginCmdEnable,
-    EWPAEAPPluginCmdDisable,
-    EWPAEAPPluginCmdPriorityUp,
-    EWPAEAPPluginCmdPriorityDown 
-    };
-
-
-#endif  //_EAPPLUGINCONFIG_HRH_
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfigUid.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UIDs 
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPPLUGINCONFIGUID_H_
-#define _EAPPLUGINCONFIGUID_H_
-
-
-// CONSTANTS
-#define EAP_PLUGIN_CONFIG_DLL_UID               0x102072BB
-
-#define EAP_PLUGIN_CONFIG_INTERFACE_UID         0x102072CA
-
-#define EAP_PLUGIN_CONFIG_IMPLEMENTATION_UID    0x102072C9
-
-
-#endif // _EAPPLUGINCONFIGUID_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfiguration.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP Plugin Configuration
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-#ifndef __EAPPLUGINCONFIGURATION_H__
-#define __EAPPLUGINCONFIGURATION_H__
-
-
-// INCLUDES
-#include <e32base.h>
-
-#include "EAPPluginConfigurationIf.h"
-#include "EAPPluginConfigUid.h"
-#include "EAPPluginList.h"
-#include "EapSettings.h"
-
-
-// CLASS DECLARATION
-/**
-* CEAPPluginConfiguration class
-*/
-class CEAPPluginConfiguration : public CEAPPluginConfigurationIf
-    {
-    public:
-        static CEAPPluginConfiguration* NewL();
-        static CEAPPluginConfiguration* NewLC();
-    
-        ~CEAPPluginConfiguration();
-    
-        /**
-        * Load the EAP Plugin configuration
-        * @param    aWPAEAPPlugin   The list of EAPs in use as it was read from
-        *                           WlanEapList column of WLANServiceTable. In 
-        *                           output it contains the new list as it has 
-        *                           to be written in the same column of 
-        *                           database.
-        * @param    aConnectionName The name of the connection.
-        * @return   The ID of the button pressed to close configuration: 
-        *           typically EAknSoftkeyBack for back, EAknCmdExit for a 
-        *           request of exit or EEikCmdExit for a request of shutdown
-        */
-        TInt EAPPluginConfigurationL( TDes& aWPAEAPPlugin, 
-                                      const TUint32 aIapID, 
-                                      const TDes& aConnectionName );    
-    
-        /**
-        * Load the EAP Plugin configuration (with expanded EAP types)
-        * @param    aWPAEnabledEAPPlugin   The list of enabled EAPs in use as 
-        *                           it was read from WlanEnabledEapList column 
-        *                           of WLANServiceTable. In output it contains 
-        *                           the new list as it has to be written in the 
-        *                           same column of database.
-        * @param    aWPADisabledEAPPlugin   The list of disabled EAPs in use as
-        *                           it was read from WlanDisabledEapList column 
-        *                           of WLANServiceTable. In output it contains 
-        *                           the new list as it has to be written in the 
-        *                           same column of database.
-        * @param    aConnectionName The name of the connection.
-        * @return   The ID of the button pressed to close configuration: 
-        *           typically EAknSoftkeyBack for back, EAknCmdExit for a 
-        *           request of exit or EEikCmdExit for a request of shutdown
-        */
-        TInt EAPPluginConfigurationL( TDes8& aWPAEnabledEAPPlugin, 
-                                      TDes8& aWPADisabledEAPPlugin, 
-                                      const TUint32 aIapID, 
-                                      const TDes& aConnectionName );
-    
-        /**
-        * Shows the EAP type info.
-        */
-        void ShowEAPTypeInfo();    
-
-        /**
-        * Deletes all EAP types' settings for
-        * the given IAP.
-        */
-        void DeleteSettingsL( const TUint32 aIapID );
-    
-        /**
-        * Changes the index of the EAP settings for all EAP types    
-        */
-        void ChangeIapIDL( const TUint32 aOldIapID, const TUint32 aNewIapID );
-    
-        /**
-        * Copies the EAP type settings to another ID
-        */
-        void CopySettingsL( const TUint32 aSourceIapID, 
-                            const TUint32 aDestinationIapID );
-
-    private:
-        void ConstructL();
-        CEAPPluginConfiguration();
-        void LoadPluginInfoL( TDes& aWPAEAPPlugin, REAPPluginList& aPlugins );
-        void LoadPluginInfoL( TDes8& aWPAEnabledEAPPlugin, 
-                              TDes8& aWPADisabledEAPPlugin, 
-                              REAPPluginList& aPlugins );
-        
-        void SavePluginInfoL( TDes& aWPAEAPPlugin, REAPPluginList& aPlugins );
-        void SavePluginInfoL( TDes8& aWPAEnabledEAPPlugin, 
-                              TDes8& aWPADisabledEAPPlugin, 
-                              REAPPluginList& aPlugins );
-                              
-
-        TInt MoveEAPType( EAPSettings::TEapType aEapType, TInt aPos );
-
-        TInt MoveEAPType( const TDesC8& aEapType, TInt aPos );
-		
-    private: // Data
-            // Resource file offset.
-        TInt        iResOffset; 
-        TUint32        iIapId;
-        RImplInfoPtrArray iEapArray;
-    };
-    
-    
-#endif      // __EAPPLUGINCONFIGURATION_H__
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfigurationModel.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class CEAPPluginConfigurationModel.
-*
-*/
-
-/*
-* %version: 12 %
-*/
-
-#ifndef __EAPPLUGINCONFIGURATIONMODEL_H__
-#define __EAPPLUGINCONFIGURATIONMODEL_H__
-
-// INCLUDES
-#include <e32base.h>
-#include <bamdesca.h>
-
-
-// FORWARD DECLARATION
-class REAPPluginList;
-
-
-// CLASS DECLARATION
-
-/**
-* UI model for WPA Security Settings UI.
-* This class formats real data so it can be displayed in the listbox.
-*/
-class CEAPPluginConfigurationModel : public CBase,
-                                     public MDesCArray
-    {
-    public:     // Constructors and destructor
-        /**
-        * Constructor.
-        * @param aPlugins Plugin list.
-        */
-        inline CEAPPluginConfigurationModel( const REAPPluginList& aPlugins );
-
-
-    public:     // from MDesCArray
-        /**
-        * Get number of elements in the descriptor array.
-        * @return The number of elements in the descriptor array.
-        */
-        TInt MdcaCount() const;
-
-        /**
-        * Index into the descriptor array.
-        * @param aIndex Index.
-        * @return Descriptor at position aIndex.
-        */
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-
-
-    public:     // new functions
-        TInt MdcaEnabledCount() const;
-
-
-    private:    // types
-        enum
-            {
-            EBufSize = 128  ///< Formatting buffer size.
-            };
-
-    private:    // data
-        const REAPPluginList& iPlugins;   ///< Plugins.
-        __MUTABLE TBuf<EBufSize> iBuf;    ///< Formatting buffer.
-
-    };
-
-#include "EAPPluginConfigurationModel.inl"
-
-#endif  // __EAPPLUGINCONFIGURATIONMODEL_H__
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginConfigurationModel.inl	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Inline method definitions of CEAPPluginConfigurationModel.
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef __EAPPLUGINCONFIGURATIONMODEL_INL__
-#define __EAPPLUGINCONFIGURATIONMODEL_INL__
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationModel::CEAPPluginConfigurationModel
-// ---------------------------------------------------------
-//
-CEAPPluginConfigurationModel::CEAPPluginConfigurationModel(
-                                            const REAPPluginList& aPlugins )
-: iPlugins( aPlugins )
-    {
-    }
-
-
-#endif  // __EAPPLUGINCONFIGURATIONMODEL_INL__
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginInfo.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class TEAPPluginInfo.
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef __EAPPLUGININFO_H__
-#define __EAPPLUGININFO_H__
-
-// INCLUDES
-#include <e32base.h>
-
-
-// FORWARD DECLARATIONS
-class CImplementationInformation;
-
-
-// CLASS DECLARATION
-
-/**
-* Information for EAP plug-ins.
-*/
-struct TEAPPluginInfo
-    {
-    public:     // Data 
-        const CImplementationInformation* iInfo;    ///< Impl. info. Not own.
-        TBool iEnabled;                             ///< ETrue if enabled.
-    };
-
-#endif  // __EAPPLUGININFO_H__
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/inc/EAPPluginList.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class REAPPluginList.
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef __EAP_PLUGIN_LIST_H__
-#define __EAP_PLUGIN_LIST_H__
-
-// INCLUDES
-#include <e32base.h>
-#include "EAPPluginInfo.h"
-
-
-// CLASS DECLARATION
-
-/**
-* Plugin info list.
-*/
-class REAPPluginList: public RArray<TEAPPluginInfo>
-    {
-    public:     // New methods
-        /**
-        * Change plugin position (reorder).
-        * @param aOldPos Current position of plugin. Must be a valid index.
-        * @param aOldPos New position of plugin. Must be a valid index.
-        */
-        void MovePos( TInt aOldPos, TInt aNewPos );
-    };
-
-#endif  // __EAP_PLUGIN_LIST_H__
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPlugInConfigurationDlg.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,615 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP Plugin Configuration dialog
-*
-*/
-
-/*
-* %version: 20.1.16 %
-*/
-
-// INCLUDE FILES
-#include <akntitle.h>
-#include <eikspane.h>
-#include <aknmfnesettingpage.h>
-#include <AknIconArray.h>
-#include <AknsUtils.h>
-#include <StringLoader.h>
-#include <aknnotewrappers.h>
-#include <EapType.h>
-
-#include <eappluginconfigres.rsg>
-#include "EAPPluginConfig.hrh"
-
-#include <avkon.mbg>
-
-#include "EAPPluginList.h"
-#include "EAPPlugInConfigurationDlg.h"
-#include "EAPPluginConfigurationModel.h"
-
-
-#include <featmgr.h>
-#include <hlplch.h>
-#include <eikappui.h>
-
-
-// CONSTANTS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::CEAPPluginConfigurationDlg
-// ---------------------------------------------------------
-//
-CEAPPluginConfigurationDlg::CEAPPluginConfigurationDlg( TInt& aButtonId,
-                                        CEAPPluginConfigurationModel& aModel,
-                                        const TUint32 aIapId )
-: CAknSelectionListDialog( iDummy, &aModel, NULL ),
-  iButtonId( &aButtonId ),
-  iModel( &aModel ),
-  iIapId( aIapId ),
-  iExiting( EFalse )
-    {
-    // Passing a dummy (iDummy) for selection index.
-    // Base class was made for 'select and dismiss' behaviour only, and does
-    // not work properly in our case (when only "Back" press dismissed the
-    // dialog and more selections are possible).
-    //
-    // iModel (the UI model) should really be owned by this dialog, but
-    // can't do that due to the malformed API of CAknSelectionListDialog.
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::~CEAPPluginConfigurationDlg
-// ---------------------------------------------------------
-//
-CEAPPluginConfigurationDlg::~CEAPPluginConfigurationDlg()
-    {
-    if ( iTitlePane )
-        {
-        // set old text back, if we have it...
-        if ( iOldTitleText )
-            {
-            TRAP_IGNORE( iTitlePane->SetTextL( *iOldTitleText ) );
-            delete iOldTitleText;
-            }
-        }
-        
-    FeatureManager::UnInitializeLib();
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CEAPPluginConfigurationDlg::ConstructAndRunLD( 
-                                               const REAPPluginList& aPlugins,
-                                               const TDesC& aTitle )
-    {
-    CleanupStack::PushL( this );
-
-    iPlugins = aPlugins;
-    iConnectionName = aTitle;
-
-    FeatureManager::InitializeLibL();
-    
-    ConstructL( R_WPA_EAP_PLUGIN_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-    
-    return CAknSelectionListDialog::ExecuteLD( R_WPA_EAP_CONFIG_DIALOG );
-    }
-
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::OkToExitL
-// ---------------------------------------------------------
-//
-TBool CEAPPluginConfigurationDlg::OkToExitL( TInt aButtonId )
-    {
-    // Translate the button presses into commands for the appui & current
-    // view to handle
-    TBool retval( EFalse );
-    if ( aButtonId == EAknSoftkeyOptions )
-        {
-        DisplayMenuL();
-        }
-    else if ( aButtonId == EEikCmdExit || 
-              aButtonId == EAknCmdExit ||
-              aButtonId == EAknSoftkeyBack )
-        {
-        *iButtonId = aButtonId;
-        retval = ETrue;
-        }
-    else if( aButtonId == EWPAEAPPluginCmdConfigure )
-        {
-        ProcessCommandL( aButtonId );
-        }
-    else if( aButtonId == EWPAEAPPluginCmdEnable )
-        {
-        ProcessCommandL( aButtonId );
-        }
-        
-
-    return retval;
-    }
-    
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                   TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            TInt current = ListBox()->CurrentItemIndex();
-            if ( iPlugins[current].iEnabled )            
-                {
-                ConfigureL(ETrue);
-                }
-            else
-                {
-                ProcessCommandL( EWPAEAPPluginCmdEnable );
-                }                
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }   
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::HandleDialogPageEventL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::HandleDialogPageEventL( TInt aEventID )
-    {
-     CAknDialog::HandleDialogPageEventL( aEventID );
-         if( iExiting )
-             {        
-             // Exit requested, exit with ok. 
-             TryExitL( EAknCmdExit );
-             }   
-
-     }
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::ConfigureL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::ConfigureL( TBool aQuick )
-    {
-    CEapType* eapType = CEapType::NewL( 
-            iPlugins[ListBox()->CurrentItemIndex()].iInfo->DataType(), 
-            ELan, 
-            iIapId );
-
-    CleanupStack::PushL( eapType );
-
-    TInt buttonId = eapType->InvokeUiL();
-    CleanupStack::PopAndDestroy( eapType );
-
-    if ( buttonId == EAknCmdExit || buttonId == EEikCmdExit )
-        {
-        if (aQuick == EFalse)
-            {
-            TryExitL( buttonId );
-            }
-        else
-            {
-            iExiting = ETrue;
-            // Don't exit here. Framework command chain will
-            // cause a KERN-EXEC 3 panic. Handle the exit in 
-            // HandleDialogPageEventL(). 
-            }
-        }
-    }
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::ProcessCommandL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::ProcessCommandL( TInt aCommandId )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    switch ( aCommandId )
-        {
-        case EAknCmdOpen:
-        case EWPAEAPPluginCmdConfigure:
-            {
-            ConfigureL(EFalse);
-            break;
-            }
-
-        case EWPAEAPPluginCmdEnable:
-            {
-            TInt cur = ListBox()->CurrentItemIndex();
-            iPlugins[cur].iEnabled = ETrue;
-
-            // enabling moves item to the top of the list
-            iPlugins.MovePos( cur, 0 );
-
-            // Highlight follows movement.
-            ListBox()->SetCurrentItemIndex( 0 );
-
-            // load the new CBA from resource
-            ButtonGroupContainer().SetCommandSetL( 
-                            R_WPA_EAP_CONFIG_SOFTKEYS_OPTIONS_BACK_CONFIGURE );                            
-            ButtonGroupContainer().DrawDeferred();
-            DrawNow();
-            break;
-            }
-
-        case EWPAEAPPluginCmdDisable:
-            {
-            if ( iModel->MdcaEnabledCount() > 1 )
-                {
-                TInt cur = ListBox()->CurrentItemIndex();
-
-                // disabling moves item just after the last enabled one,
-                // so find that position
-                TInt next = cur;
-                
-                while ( next < iModel->MdcaCount() - 1 &&
-                        iPlugins[next].iEnabled )
-                    {
-                    ++next;
-                    }
-
-                if ( next > cur && !iPlugins[next].iEnabled ) 
-                    {
-                    --next;
-                    }
-
-
-                iPlugins[cur].iEnabled = EFalse;
-
-                // move item if needed
-                iPlugins.MovePos( cur, next );
-
-                // Highlight follows movement.
-                ListBox()->SetCurrentItemIndex( next );
-                
-                // load the new CBA from resource
-                ButtonGroupContainer().SetCommandSetL( 
-                               R_WPA_EAP_CONFIG_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                ButtonGroupContainer().DrawDeferred();
-                DrawNow();
-                }
-            else
-                {
-                HBufC* stringLabel;
-                
-                stringLabel = StringLoader::LoadL( R_INFO_CANNOT_DISABLE,
-                                                   iEikonEnv );
-
-                CleanupStack::PushL( stringLabel );
-
-                CAknInformationNote* dialog = new ( ELeave )
-                                                CAknInformationNote( ETrue );
-                dialog->ExecuteLD( *stringLabel );
-
-                CleanupStack::PopAndDestroy( stringLabel );
-                }
-
-            break;
-            }
-
-        case EWPAEAPPluginCmdPriorityUp:
-            {
-            TInt cur = ListBox()->CurrentItemIndex();
-            iPlugins.MovePos( cur, cur - 1 );
-
-            // Highlight follows movement.
-            ListBox()->SetCurrentItemIndexAndDraw( cur - 1 );
-            break;
-            }
-
-        case EWPAEAPPluginCmdPriorityDown:
-            {
-            TInt cur = ListBox()->CurrentItemIndex();
-
-            iPlugins.MovePos( cur, cur + 1 );
-            // Highlight follows movement.
-            ListBox()->SetCurrentItemIndexAndDraw( cur + 1 );
-
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-        case EEikCmdExit:
-            {
-            TryExitL( aCommandId );
-            break;
-            }
-
-        default:
-            {
-            CAknSelectionListDialog::ProcessCommandL( aCommandId );
-            break;
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::PreLayoutDynInitL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::PreLayoutDynInitL()
-    {
-    CAknSelectionListDialog::PreLayoutDynInitL();
-
-    // first get StatusPane
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-
-    // then get TitlePane
-    iTitlePane = ( CAknTitlePane* ) statusPane->ControlL( TUid::Uid( 
-                                                    EEikStatusPaneUidTitle ) );
-    // if not already stored, store it for restoring
-    if ( !iOldTitleText )
-        {
-        iOldTitleText = iTitlePane->Text()->AllocL();
-        }
-
-    // set new titlepane text
-    iTitlePane->SetTextL( iConnectionName );
-
-    SetIconsL();
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::SetIconsL()
-// ---------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::SetIconsL()
-    {
-    CArrayPtr< CGulIcon >* icons = new( ELeave ) CAknIconArray( 1 );
-    CleanupStack::PushL( icons );
-
-    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-
-    CGulIcon* icon = CGulIcon::NewLC();
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* mask = NULL;    
-    AknsUtils::CreateColorIconL( skinInstance,
-                                 KAknsIIDQgnIndiMarkedAdd, 
-                                 KAknsIIDQsnIconColors, 
-                                 EAknsCIQsnIconColorsCG13, 
-                                 bitmap, 
-                                 mask, 
-                                 AknIconUtils::AvkonIconFileName(),
-                                 EMbmAvkonQgn_indi_marked_add, 
-                                 EMbmAvkonQgn_indi_marked_add_mask,
-                                 KRgbBlack );
-    icon->SetBitmap( bitmap );
-    icon->SetMask( mask );    
-    icons->AppendL( icon );
-                
-    CleanupStack::Pop( icon ); 
-
-    SetIconArrayL( icons );
-
-    CleanupStack::Pop( icons );
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::DynInitMenuPaneL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::DynInitMenuPaneL( TInt aResourceId, 
-                                                CEikMenuPane* aMenuPane )
-    {
-    CAknSelectionListDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-    if ( aMenuPane && aResourceId == R_WPA_EAP_PLUGIN_MENU )
-        {
-        if ( !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-        if ( !iModel->MdcaCount() )
-            {
-            // if no plug-ins then dim the whole menu.
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdConfigure, ETrue );
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdEnable, ETrue );
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdDisable, ETrue );
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdPriorityUp, ETrue );
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdPriorityDown, ETrue );
-            }
-        else
-            {
-            TInt current = ListBox()->CurrentItemIndex();
-            TBool enabled = iPlugins[current].iEnabled;
-            
-            // Hide either "Enable" or "Disable", as appropriate.
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdEnable, enabled );
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdDisable, !enabled );
-            
-            // Don't display "Configure" for disabled items
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdConfigure, !enabled );
-            
-            // Don't display "Raise priority" nor "Lower priority" for 
-            // disabled items
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdPriorityUp, !enabled );
-            aMenuPane->SetItemDimmed( EWPAEAPPluginCmdPriorityDown, !enabled );
-            
-            
-            if ( enabled )
-                {
-                if ( current == 0 )
-                    {
-                    // Can't go higher than top.
-                    aMenuPane->SetItemDimmed( EWPAEAPPluginCmdPriorityUp, 
-                                              ETrue );
-                    }
-                
-                if ( current == iModel->MdcaCount() - 1 || 
-                        ( current < iModel->MdcaCount() - 1 && 
-                        !iPlugins[current + 1].iEnabled ) )
-                    {
-                    // Can't go lower than the last enabled item
-                    aMenuPane->SetItemDimmed( EWPAEAPPluginCmdPriorityDown, 
-                                              ETrue );
-                    }
-                }            
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::OfferKeyEventL
-// ---------------------------------------------------------
-//
-TKeyResponse CEAPPluginConfigurationDlg::OfferKeyEventL( 
-                                                const TKeyEvent& aKeyEvent, 
-                                                TEventCode aType )
-    {
-    TKeyResponse result( EKeyWasNotConsumed );
-    
-    if ( aType == EEventKey )
-        {
-        
-        // Exit handling 
-        if ( aKeyEvent.iCode == EKeyEscape )
-            {
-            TryExitL( EEikCmdExit );
-            return EKeyWasConsumed;
-            }
-        
-        TInt current = ListBox()->CurrentItemIndex();
-        
-        // Handle Enter key here, since it doesn't seem to convert into
-        // the proper command id via the normal route
-        // (maybe some Avkon support for Enter key is still missing in
-        // S60 3.2 2008_wk22)
-        if ( aKeyEvent.iCode == EKeyEnter )
-            {
-            if ( iPlugins[current].iEnabled )
-                {
-                OkToExitL( EWPAEAPPluginCmdConfigure );
-                }
-            else
-                {
-                OkToExitL( EWPAEAPPluginCmdEnable );
-                }
-                
-            result = EKeyWasConsumed;
-            }
-        else
-            {
-            result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-            }
-                
-        TInt next = ListBox()->CurrentItemIndex();
-
-        if ( current != next &&
-             ( iPlugins[current].iEnabled && !iPlugins[next].iEnabled ||
-               !iPlugins[current].iEnabled && iPlugins[next].iEnabled ) )
-            {
-            // status is different, the CBA must be changed
-            CEikButtonGroupContainer& cba = ButtonGroupContainer();
-
-            // load the new set from resource
-            if ( iPlugins[next].iEnabled )
-                {
-                cba.SetCommandSetL(  
-                            R_WPA_EAP_CONFIG_SOFTKEYS_OPTIONS_BACK_CONFIGURE );                           
-                }
-            else
-                {
-                cba.SetCommandSetL(  
-                            R_WPA_EAP_CONFIG_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                }
-
-            cba.DrawDeferred();
-            }
-        }
-    else
-        {
-        // pass event up the hierarchy
-        result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );        
-        }
-        
-    
-   
-    return result;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CEAPPluginConfigurationDlg::HandleResourceChange
-// ----------------------------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::HandleResourceChange( TInt aType )
-    {
-    CAknSelectionListDialog::HandleResourceChange( aType );
-
-    if ( aType == KAknsMessageSkinChange )
-        {
-        TRAP_IGNORE( SetIconsL() );
-        SizeChanged();
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationDlg::GetHelpContext
-// ---------------------------------------------------------
-//
-void CEAPPluginConfigurationDlg::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPlugInConfigurationModel.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CEAPPlugInConfigurationModel
-*
-*/
-
-/*
-* %version: 14 %
-*/
-
-// INCLUDE FILES
-#include "EAPPluginConfigurationModel.h"
-#include "EAPPluginList.h"
-#include <ecom/ecom.h>
-
-
-// CONSTANTS
-
-// Format text for MdcaPoint when Enabled
-_LIT( KFormatEnabled, "%d\t%S\t%d\t" );
-
-// Format text for MdcaPoint when Disabled
-_LIT( KFormatDisabled, "\t%S\t\t" );
-
-
-/**
-* Maximum length of the formatted text excluding the name.
-* (I.e. if the name is trimmed to this length, there will not be overflow.)
-* Includes the formatting tabs (3), the icon index length (1) plus maximum
-* length of an integer (11).
-*/
-LOCAL_D const TInt KMaxLenForEmptyName = 15;
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationModel::MdcaCount
-// ---------------------------------------------------------
-//
-TInt CEAPPluginConfigurationModel::MdcaCount() const
-    {
-    return iPlugins.Count();
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationModel::MdcaPoint
-// ---------------------------------------------------------
-//
-TPtrC16 CEAPPluginConfigurationModel::MdcaPoint( TInt aIndex ) const
-    {
-    // Oddly enough, MdcaPoint is const. We need to use MUTABLE_CAST.
-    TInt maxName = EBufSize - KMaxLenForEmptyName;
-    TPtrC name( iPlugins[aIndex].iInfo->DisplayName() );
-    if ( name.Length() > maxName )
-        {
-        name.Set( name.Left( maxName ) );
-        }
-
-    if ( iPlugins[aIndex].iEnabled )
-        {
-        MUTABLE_CAST( TBuf<EBufSize>&, iBuf ).Format( KFormatEnabled, 
-                                                      aIndex+1, &name, 0 );
-        }
-    else
-        {
-        MUTABLE_CAST( TBuf<EBufSize>&, iBuf ).Format( KFormatDisabled, &name );
-        }
-
-    return iBuf;
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfigurationModel::MdcaEnabledCount
-// ---------------------------------------------------------
-//
-TInt CEAPPluginConfigurationModel::MdcaEnabledCount() const
-    {
-    TInt index;
-    TInt nPlugins = MdcaCount();
-    TInt numEnabled = 0;
-
-    for ( index = 0; index < nPlugins; index++ )
-        {
-        if ( iPlugins[index].iEnabled )
-            {
-            numEnabled++;
-            }
-        }
-
-    return numEnabled;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPluginConfiguration.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,836 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP Plugin Configuration
-*
-*/
-
-/*
-* %version: 24 %
-*/
-
-// INCLUDE FILES
-#include "EAPPluginConfiguration.h"
-#include "EAPPlugInConfigurationDlg.h"
-#include "EAPPluginConfigurationModel.h"
-#include <bautils.h>
-#include <EapType.h>
-#include "EAPPluginList.h"
-
-#include <ecom/ecom.h>
-#include <data_caging_path_literals.hrh>
-#include <eappluginconfigres.rsg>
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "EAPPluginConfigRes.rsc" );   // RSC file name.
-_LIT( KSpace, " " );
-_LIT( KPlusSign, "+" );
-_LIT( KMinusSign, "-" );
-_LIT( KComma, "," );
-
-
-// Length of the UID
-static const TInt KLengthOfImplUid = 3;
-
-// Length of expanded EAP type (RFC 3748)
-static const TInt KLengthOfExpEapType = 8; 
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEAPPluginConfiguration::CEAPPluginConfiguration
-// -----------------------------------------------------------------------------
-//
-CEAPPluginConfiguration::CEAPPluginConfiguration()
-: iIapId( 0 )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEAPPluginConfiguration::NewL
-// -----------------------------------------------------------------------------
-//
-CEAPPluginConfiguration* CEAPPluginConfiguration::NewL() 
-    {
-    CEAPPluginConfiguration* self = NewLC();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-    
-// -----------------------------------------------------------------------------
-// CEAPPluginConfiguration::NewLC
-// -----------------------------------------------------------------------------
-//
-CEAPPluginConfiguration* CEAPPluginConfiguration::NewLC()
-    {
-    CEAPPluginConfiguration* self = new( ELeave )CEAPPluginConfiguration();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEAPPluginConfiguration::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEAPPluginConfiguration::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEAPPluginConfiguration::~CEAPPluginConfiguration
-// -----------------------------------------------------------------------------
-//
-CEAPPluginConfiguration::~CEAPPluginConfiguration()
-    {    
-    iEapArray.ResetAndDestroy();
-    CCoeEnv::Static()->DeleteResourceFile( iResOffset );
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::EAPPluginConfigurationL
-// ---------------------------------------------------------
-//
-TInt CEAPPluginConfiguration::EAPPluginConfigurationL( TDes& aWPAEAPPlugin,
-                                                 const TUint32 aIapId, 
-                                                 const TDes& aConnectionName )
-    {
-  	// Adding the resource file to the CoeEnv.
-    if( !iResOffset )
-        {  		
-        TFileName fileName;
-
-        fileName.Append( KDriveZ );
-        fileName.Append( KDC_RESOURCE_FILES_DIR );
-        fileName.Append( KResourceFileName );
-	    
-        BaflUtils::NearestLanguageFile( CCoeEnv::Static()->FsSession(), 
-                                        fileName );
-	    
-	    TRAP_IGNORE( iResOffset = 
-                            CCoeEnv::Static()->AddResourceFileL( fileName ); );
-  	    }       
-
-    TInt buttonId;
-    
-    REAPPluginList plugins;            ///< Plug-in infos.
-    
-    LoadPluginInfoL( aWPAEAPPlugin, plugins );
-    CEAPPluginConfigurationModel* model = new( ELeave ) 
-                                    CEAPPluginConfigurationModel( plugins );
-    CleanupStack::PushL( model );
-
-    CEAPPluginConfigurationDlg* pluginDlg = new( ELeave ) 
-                        CEAPPluginConfigurationDlg( buttonId, *model, aIapId );
-
-    pluginDlg->ConstructAndRunLD( plugins, aConnectionName );
-
-    SavePluginInfoL( aWPAEAPPlugin, plugins );
-    
-    CleanupStack::PopAndDestroy( model );
-    plugins.Close();
-    
-    iIapId = aIapId;
-
-    return buttonId;
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::EAPPluginConfigurationL
-// ---------------------------------------------------------
-//
-TInt CEAPPluginConfiguration::EAPPluginConfigurationL( 
-                                                TDes8& aWPAEnabledEAPPlugin,
-                                                TDes8& aWPADisabledEAPPlugin,
-                                                const TUint32 aIapId, 
-                                                const TDes& aConnectionName )
-    {
-  	// Adding the resource file to the CoeEnv.
-    if( !iResOffset )
-        {  		
-        TFileName fileName;
-
-        fileName.Append( KDriveZ );
-        fileName.Append( KDC_RESOURCE_FILES_DIR );
-        fileName.Append( KResourceFileName );
-	    
-        BaflUtils::NearestLanguageFile( CCoeEnv::Static()->FsSession(), 
-                                        fileName );
-	    
-	    TRAP_IGNORE( iResOffset = 
-                            CCoeEnv::Static()->AddResourceFileL( fileName ); );
-  	    }       
-
-
-    TInt buttonId;
-    
-    REAPPluginList plugins;            ///< Plug-in infos.
-    
-    LoadPluginInfoL( aWPAEnabledEAPPlugin, aWPADisabledEAPPlugin, plugins );
-    CEAPPluginConfigurationModel* model = new( ELeave ) 
-                                    CEAPPluginConfigurationModel( plugins );
-    CleanupStack::PushL( model );
-
-    CEAPPluginConfigurationDlg* pluginDlg = new( ELeave ) 
-                        CEAPPluginConfigurationDlg( buttonId, *model, aIapId );
-
-    pluginDlg->ConstructAndRunLD( plugins, aConnectionName );
-
-    SavePluginInfoL( aWPAEnabledEAPPlugin, aWPADisabledEAPPlugin, plugins );
-    
-    CleanupStack::PopAndDestroy( model );
-    plugins.Close();
-    
-    iIapId = aIapId;
-
-    return buttonId;
-    }
-    
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::LoadPluginInfoL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfiguration::LoadPluginInfoL( TDes& aWPAEAPPlugin, 
-                                               REAPPluginList& aPlugins )
-    {
-    TInt posComma = aWPAEAPPlugin.Locate( ',' );
-    while ( posComma != KErrNotFound )                // Extract the parameters
-        {
-        aWPAEAPPlugin.Replace( posComma, 1, KSpace );
-        posComma = aWPAEAPPlugin.Locate( ',' );
-        }
-
-    TLex lex( aWPAEAPPlugin );
-
-    CArrayFixFlat<TPtrC>* params;       // array of parameters
-    params = new( ELeave ) CArrayFixFlat<TPtrC>( sizeof( TPtrC ) );
-    CleanupStack::PushL( params );
-
-    while ( !lex.Eos() )                // Extract the parameters
-        {
-        params->AppendL( lex.NextToken() );
-        }
-
-    aPlugins.Reset();   // Reset this first: dependent on iEapArray.
-    iEapArray.ResetAndDestroy();
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, iEapArray );
-
-    // EAP plugin interface dialog should show only the EAP types that allowed
-    // outside PEAP.
-    
-    for( TInt count = 0; count < iEapArray.Count(); count++ )
-        {
-        // Filter out the EAP types which are NOT allowed outside PEAP.
-        if( CEapType::IsDisallowedOutsidePEAP( *iEapArray[count] ) )
-            {
-            // Delete the EAP type, which isn't allowed outside PEAP, 
-            // from the array.
-            delete iEapArray[count];
-            iEapArray.Remove( count );
-            
-            // One item removed from the array. So reduce the item count.
-            count--;
-            }
-        }
-
-    TInt numParams = params->Count();
-    TBool foundDefaultEAPTypes = EFalse;
-    
-    // Rearrange the array so that EAP-SIM and EAP-AKA are on top, in that order.
-    
-    // The rearrange is needed only for the first time creation.
-    if ( numParams == 0 )
-        {
-        TInt topPos = 0; // position in the beginning of arrary.
-        TInt error( KErrNone );
-
-        // First move EAP-AKA to top, if it is present in the array.
-        error = MoveEAPType( EAPSettings::EEapAka, topPos );
-
-        if ( error != KErrNotFound )
-            {
-            // Found EAP-AKA in the array. 
-            // Doesn't matter if the move was a success or not.
-            foundDefaultEAPTypes = ETrue;
-            }
-
-        // Now move EAP-SIM to top. 
-        // EAP-SIM will be always the top most if it is present in the array.
-        // Otherwise EAP-AKA stays in the top, if it is present.
-        // The order doesn't matter if these two are not present.
-        MoveEAPType( EAPSettings::EEapSim, topPos );
-
-        if( error != KErrNotFound)
-            {
-            // Found EAP-SIM in the array. 
-            // Doesn't matter if the move was a success.
-            foundDefaultEAPTypes = ETrue;
-            }   
-        }
-
-    TInt i;
-    TInt j;
-    TInt numInfoStore = iEapArray.Count();
-    TInt eapUid;
-    
-    // just to make sure we are not given a non-empty but fully disabled list
-    TBool gotEnabled = EFalse;
-
-    CArrayFix<TInt>* usedImplInfo = new( ELeave ) CArrayFixFlat<TInt>( 4 );
-    CleanupStack::PushL( usedImplInfo );
-    usedImplInfo->AppendL( 0, numInfoStore );
-
-    for ( j = 0; j < numParams; j++ )
-        {
-        TLex lexUid( params->At( j ) );
-        if ( lexUid.Val( eapUid ) == KErrNone )
-            {
-            for ( i = 0; i < numInfoStore; i++ )
-                {
-                TLex8 lexDataType( iEapArray[i]->DataType() );
-                TInt implUID;
-
-                if ( lexDataType.Val( implUID ) == KErrNone )
-                    {
-                    if ( implUID == Abs( eapUid ) )
-                        {
-                        usedImplInfo->InsertL( i, 1 );
-                        if ( i+1 < usedImplInfo->Count() )
-                            {
-                            usedImplInfo->Delete( i+1 );
-                            }
-
-                        TEAPPluginInfo plugin;
-                        plugin.iInfo = iEapArray[i];
-
-                        plugin.iEnabled = ( eapUid > 0 || 
-                                ( eapUid == 0 && 
-                                  params->At( j ).Left( 1 ) == KPlusSign ) );
-                        User::LeaveIfError( aPlugins.Append( plugin ) );
-                        gotEnabled = gotEnabled || plugin.iEnabled;
-                        i = numInfoStore;  // to exit from cycle
-                        }
-                    }
-                }   
-            }
-        }
-
-    for ( i = 0; i < numInfoStore; i++ )
-        {
-        if ( !usedImplInfo->At( i ) )
-            {
-            TEAPPluginInfo plugin;
-            plugin.iInfo = iEapArray[i];
-            
-            // Default is enabled. 
-            // There should not be a case of all EAP types disabled.
-            TBool defaultEnableValue( ETrue ); 
-            
-            if ( numParams > 0 && gotEnabled)
-                {
-                // If there some EAP types which are already enabled/disabled,
-                // we make the new EAP types disabled.
-                defaultEnableValue = EFalse;
-                }
-            else
-                {
-                // Nothing in the string or all disabled.
-                // Should be the first time execution (creating new IAP).
-                // Only EAP-SIM and EAP-AKA are enabled in this case.
-                TLex8 lexDataType( iEapArray[i]->DataType() );
-                TInt implDataType;
-                
-                if ( lexDataType.Val( implDataType ) == KErrNone )
-                    {
-                    if( foundDefaultEAPTypes )
-                        {
-                        defaultEnableValue = 
-                                    ( implDataType == EAPSettings::EEapSim ||
-                                      implDataType == EAPSettings::EEapAka );
-                        }
-                    else
-                        {
-                        // No default EAPs (No EAP-SIM and EAP-AKA). 
-                        // So all EAP types are enabled by default.
-                        defaultEnableValue = ETrue;
-                        }
-                    }
-                }
-
-            plugin.iEnabled = defaultEnableValue;
-            User::LeaveIfError( aPlugins.Append( plugin ) );
-            }
-        }
-
-    CleanupStack::PopAndDestroy( 2, params );  // usedImplInfo, params
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::LoadPluginInfoL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfiguration::LoadPluginInfoL( TDes8& aWPAEnabledEAPPlugin, 
-                                               TDes8& aWPADisabledEAPPlugin, 
-                                               REAPPluginList& aPlugins )
-    {
-    // size of aWPAEnabledEAPPlugin and aWPADisabledEAPPlugin must be 
-    // divisible by KLengthOfExpEapType
-    __ASSERT_DEBUG( ( aWPAEnabledEAPPlugin.Size() % KLengthOfExpEapType == 0 ), 
-                    User::Panic( _L( "aWPAEnabledEAPPlugin is corrupted!" ), KErrCorrupt ) );
-                     
-    __ASSERT_DEBUG( ( aWPADisabledEAPPlugin.Size() % KLengthOfExpEapType == 0 ), 
-                    User::Panic( _L( "aWPADisabledEAPPlugin is corrupted!" ), KErrCorrupt ) );
-    
-
-    aPlugins.Reset();   // Reset this first: dependent on iEapArray.
-    iEapArray.ResetAndDestroy();
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, iEapArray );
-
-    // EAP plugin interface dialog should show only the EAP types that allowed
-    // outside PEAP.
-    
-    for( TInt count = 0; count < iEapArray.Count(); count++ )
-        {
-        // Filter out the EAP types which are NOT allowed outside PEAP.
-        if( CEapType::IsDisallowedOutsidePEAP( *iEapArray[count] ) )
-            {
-            // Delete the EAP type, which isn't allowed outside PEAP, 
-            // from the array.
-            delete iEapArray[count];
-            iEapArray.Remove( count );
-            
-            // One item removed from the array. So reduce the item count.
-            count--;
-            }
-        }
-
-    TInt numEnabled = aWPAEnabledEAPPlugin.Size() / KLengthOfExpEapType;
-    TInt numDisabled = aWPADisabledEAPPlugin.Size() / KLengthOfExpEapType;
-    TBool foundDefaultEAPTypes = EFalse;
-    
-    // Rearrange the array so that EAP-SIM and EAP-AKA are on top, in that order.
-    
-    // The rearrange is needed only for the first time creation.
-    if ( !( numEnabled || numDisabled ) )
-        {
-        TInt topPos = 0; // position in the beginning of array.
-        TInt error( KErrNone );
-
-        // First move EAP-AKA to top, if it is present in the array.
-        _LIT8( KExpEapTypeFormat, "\xFE\0\0\0%c%c%c%c" );
-        TBuf8<KLengthOfExpEapType> tmpEap;
-        
-        // BigEndian::Put32( const_cast<TUint8*>( tmpEap.Ptr() ) + 4, 
-        //                  EAPSettings::EEapAka );
-        tmpEap.Format( KExpEapTypeFormat, ( EAPSettings::EEapAka >> 24 ) & 0xff, 
-                                          ( EAPSettings::EEapAka >> 16 ) & 0xff,
-                                          ( EAPSettings::EEapAka >> 8 ) & 0xff,
-                                          EAPSettings::EEapAka & 0xff );
-                                          
-        error = MoveEAPType( tmpEap, topPos );
-
-        if ( error != KErrNotFound )
-            {
-            // Found EAP-AKA in the array. 
-            // Doesn't matter if the move was a success or not.
-            foundDefaultEAPTypes = ETrue;
-            }
-
-        // Now move EAP-SIM to top. 
-        // EAP-SIM will be always the top most if it is present in the array.
-        // Otherwise EAP-AKA stays in the top, if it is present.
-        // The order doesn't matter if these two are not present.
-        // BigEndian::Put32( const_cast<TUint8*>( tmpEap.Ptr() ) + 4, 
-        //                  EAPSettings::EEapSim );
-        tmpEap.Format( KExpEapTypeFormat, ( EAPSettings::EEapSim >> 24 ) & 0xff, 
-                                          ( EAPSettings::EEapSim >> 16 ) & 0xff,
-                                          ( EAPSettings::EEapSim >> 8 ) & 0xff,
-                                          EAPSettings::EEapSim & 0xff );
-                                          
-        error = MoveEAPType( tmpEap, topPos );
-
-        if( error != KErrNotFound)
-            {
-            // Found EAP-SIM in the array. 
-            // Doesn't matter if the move was a success.
-            foundDefaultEAPTypes = ETrue;
-            }   
-        }
-
-    TInt i;
-    TInt j;
-    TInt numInfoStore = iEapArray.Count();
-
-    CArrayFix<TInt>* usedImplInfo = new( ELeave ) CArrayFixFlat<TInt>( 4 );
-    CleanupStack::PushL( usedImplInfo );
-  
-    usedImplInfo->AppendL( 0, numInfoStore );
-
-    // deal with the enabled first
-    for ( j = 0; j < numEnabled; j++ )
-        {
-    	TPtrC8 param( aWPAEnabledEAPPlugin.Ptr() + KLengthOfExpEapType * j, 
-    	              KLengthOfExpEapType );
-    	
-        for ( i = 0; i < numInfoStore; i++ )
-            {
-            if ( !param.Compare( iEapArray[i]->DataType() ) )
-                {
-                usedImplInfo->InsertL( i, 1 );
-                if ( i+1 < usedImplInfo->Count() )
-                    {
-                    usedImplInfo->Delete( i+1 );
-                    }
-
-                TEAPPluginInfo plugin;
-                plugin.iInfo = iEapArray[i];
-                plugin.iEnabled = ETrue;
-                
-                User::LeaveIfError( aPlugins.Append( plugin ) );
-                i = numInfoStore;  // to exit from cycle
-                }
-            }   
-        }
-
-
-    // now come the disabled
-    for ( j = 0; j < numDisabled; j++ )
-        {
-    	TPtrC8 param( aWPADisabledEAPPlugin.Ptr() + KLengthOfExpEapType * j, 
-    	              KLengthOfExpEapType );
-    	
-        for ( i = 0; i < numInfoStore; i++ )
-            {
-            if ( !param.Compare( iEapArray[i]->DataType() ) )
-                {
-                usedImplInfo->InsertL( i, 1 );
-                if ( i+1 < usedImplInfo->Count() )
-                    {
-                    usedImplInfo->Delete( i+1 );
-                    }
-
-                TEAPPluginInfo plugin;
-                plugin.iInfo = iEapArray[i];
-                plugin.iEnabled = EFalse;
-                
-                User::LeaveIfError( aPlugins.Append( plugin ) );
-                i = numInfoStore;  // to exit from cycle
-                }
-            }   
-        }
-        
-
-    for ( i = 0; i < numInfoStore; i++ )
-        {
-        if ( !usedImplInfo->At( i ) )
-            {
-            TEAPPluginInfo plugin;
-            plugin.iInfo = iEapArray[i];
-            
-            // Default is enabled. 
-            // There should not be a case of all EAP types disabled.
-            TBool defaultEnableValue( ETrue ); 
-            
-            if ( numEnabled > 0 )
-                {
-                // If there some EAP types which are already enabled/disabled,
-                // we make the new EAP types disabled.
-                defaultEnableValue = EFalse;
-                }
-            else
-                {
-                // No EAP types enabled. 
-                // Should be the first time execution (creating new IAP).
-                // Only EAP-SIM and EAP-AKA are enabled in this case.
-                
-                // [FE] [00 00 00] [TEapType_bigendian]
-                const TDesC8& cue = iEapArray[i]->DataType();
-                
-                TPtrC8 eapType( cue.Ptr() + 4, 4 );
-                TUint32 implDataType = ( eapType[0] << 24 ) |
-                                       ( eapType[1] << 16 ) |
-                                       ( eapType[2] << 8 ) |
-                                       eapType[3];
-
-                if( foundDefaultEAPTypes )
-                    {
-                    _LIT8( KExpEapFirstQuad, "\xFE\0\0\0" );
-                    TPtrC8 firstQuad( cue.Ptr(), 4 );
-                    
-                    defaultEnableValue = 
-                            ( !firstQuad.Compare ( KExpEapFirstQuad ) &&
-                                ( implDataType == EAPSettings::EEapSim ||
-                                  implDataType == EAPSettings::EEapAka ) );
-                    }
-                else
-                    {
-                    // No default EAPs (No EAP-SIM and EAP-AKA). 
-                    // So all EAP types are enabled by default.
-                    defaultEnableValue = ETrue;
-                    }
-                }
-
-            plugin.iEnabled = defaultEnableValue;
-            User::LeaveIfError( aPlugins.Append( plugin ) );
-            }
-        }
-    CleanupStack::PopAndDestroy( usedImplInfo );
-    
-    }
-    
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::SavePluginInfoL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfiguration::SavePluginInfoL( TDes& aWPAEAPPlugin, 
-                                               REAPPluginList& aPlugins )
-    {
-    aWPAEAPPlugin.Zero();
-    for ( TInt index = 0; index < aPlugins.Count(); index++ )
-        {
-        TBuf8<KLengthOfImplUid> cue = aPlugins[index].iInfo->DataType(); 
-
-        TLex8 lexDataType( cue );
-        TInt implUID;
-        if ( lexDataType.Val( implUID ) == KErrNone )
-            {
-            if ( aPlugins[index].iEnabled )
-                {
-                aWPAEAPPlugin.Append( KPlusSign );
-                }
-            else
-                {
-                aWPAEAPPlugin.Append( KMinusSign );
-                }
-
-            aWPAEAPPlugin.AppendNumFixedWidth( implUID, EDecimal, 
-                                               KLengthOfImplUid );
-
-            if ( index != aPlugins.Count()-1 )
-                {
-                aWPAEAPPlugin.Append( KComma );
-                }
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::SavePluginInfoL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfiguration::SavePluginInfoL( TDes8& aWPAEnabledEAPPlugin, 
-                                               TDes8& aWPADisabledEAPPlugin, 
-                                               REAPPluginList& aPlugins )
-    {
-    aWPAEnabledEAPPlugin.Zero();
-    aWPADisabledEAPPlugin.Zero();
-    
-    for ( TInt index = 0; index < aPlugins.Count(); index++ )
-        {
-        if ( aPlugins[index].iEnabled )
-            {
-            aWPAEnabledEAPPlugin.Append( aPlugins[index].iInfo->DataType() );
-            }
-        else
-            {
-            aWPADisabledEAPPlugin.Append( aPlugins[index].iInfo->DataType() );
-            }
-        } 
-    
-    }
-    
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::ShowEAPTypeInfo
-// ---------------------------------------------------------
-//
-void CEAPPluginConfiguration::ShowEAPTypeInfo()
-    {    
-    
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::DeleteSettingsL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfiguration::DeleteSettingsL( const TUint32 aIapID )
-    {    
-    iEapArray.ResetAndDestroy();
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, iEapArray );
-        
-    for ( TInt i = 0; i < iEapArray.Count(); i++ )
-        {
-        if ( !CEapType::IsDisallowedOutsidePEAP( *iEapArray[i] ) )
-            {
-            CEapType* eapType = CEapType::NewL( iEapArray[i]->DataType(), 
-                                                ELan, 
-                                                aIapID );
-            CleanupStack::PushL( eapType );
-            
-            eapType->DeleteConfigurationL();
-            CleanupStack::PopAndDestroy( eapType );
-            }
-        }    
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::ChangeIapIDL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfiguration::ChangeIapIDL( const TUint32 aOldIapID,
-                                            const TUint32 aNewIapID )
-    {
-    iEapArray.ResetAndDestroy();
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, iEapArray );
-        
-    for ( TInt i = 0; i < iEapArray.Count(); i++ )
-        {
-        if ( !CEapType::IsDisallowedOutsidePEAP( *iEapArray[i] ) )
-            {
-            CEapType* eapType = CEapType::NewL( iEapArray[i]->DataType(), 
-                                                ELan, 
-                                                aOldIapID );
-            CleanupStack::PushL( eapType );
-            
-            eapType->SetIndexL( ELan, aNewIapID );
-            CleanupStack::PopAndDestroy( eapType );
-        }
-    }    
-}
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::CopySettingsL
-// ---------------------------------------------------------
-//
-void CEAPPluginConfiguration::CopySettingsL( const TUint32 aSourceIapID,
-	                                         const TUint32 aDestinationIapID )
-    {
-	iEapArray.ResetAndDestroy();
-	REComSession::ListImplementationsL( KEapTypeInterfaceUid, iEapArray );
-		
-	for ( TInt i = 0; i < iEapArray.Count(); i++ )
-	    {
-		if ( !CEapType::IsDisallowedOutsidePEAP( *iEapArray[i] ) )
-		    {
-			CEapType* eapType = CEapType::NewL( iEapArray[i]->DataType(), 
-			                                    ELan, 
-			                                    aSourceIapID );
-			CleanupStack::PushL( eapType );
-			
-			eapType->CopySettingsL( ELan, aDestinationIapID );
-			CleanupStack::PopAndDestroy( eapType );
-    		}
-	    }	
-    }
-        
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::MoveEAPType
-// ---------------------------------------------------------
-//
-TInt CEAPPluginConfiguration::MoveEAPType( EAPSettings::TEapType aEapType, 
-                                           TInt aPos )
-    {
-    TInt error( KErrNotFound );
-
-    // Parse the array to find out the desired EAP type.
-    for( TInt count = 0; count < iEapArray.Count(); count++ )
-        {
-        TLex8 lexDataType( iEapArray[count]->DataType() );
-        TInt implDataType;
-        
-        if ( lexDataType.Val( implDataType ) == KErrNone )
-            {
-            if ( implDataType == aEapType )
-                {
-                // Move this to the required destination.
-                error = iEapArray.Insert( iEapArray[count], aPos );
-
-                if( KErrNone == error )
-                    {
-                    // Delete the old entry. It should be one count up now.
-                    iEapArray.Remove( count+1 );          			
-                    }
-                else
-                    {
-                    // Some problem. Couldn't move.
-                    error = KErrUnknown;
-                    }
-
-                // No need to parse further in the array. 
-                // We found the needed EAP type.
-                break; 
-                }
-            }
-        else
-            {
-            error = KErrGeneral;
-            }
-        }
-
-    return error;
-    }
-
-
-// ---------------------------------------------------------
-// CEAPPluginConfiguration::MoveEAPType
-// ---------------------------------------------------------
-//
-TInt CEAPPluginConfiguration::MoveEAPType( const TDesC8& aEapType, TInt aPos )
-    {
-    TInt error( KErrNotFound );
-
-    // Parse the array to find out the desired EAP type.
-    for( TInt count = 0; count < iEapArray.Count(); count++ )
-        {
-        if ( !iEapArray[count]->DataType().Compare( aEapType ) )
-            {
-            // Move this to the required destination.
-            error = iEapArray.Insert( iEapArray[count], aPos );
-
-            if( KErrNone == error )
-                {
-                // Delete the old entry. It should be one count up now.
-                iEapArray.Remove( count+1 );          			
-                }
-            else
-                {
-                // Some problem. Couldn't move.
-                error = KErrUnknown;
-                }
-
-            // No need to parse further in the array. 
-            // We found the needed EAP type.
-            break; 
-            }
-        }
-
-    return error;
-    }
-
-// End of file.
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPluginConfigurationProxy.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Some functions that ECom needs.
-*
-*/
-
-/*
-* %version: 12 %
-*/
-
-// INCLUDE FILES
-#include "EAPPluginConfiguration.h"
-#include "EAPPluginConfigUid.h"
-
-#include <e32base.h>
-#include <ecom/implementationproxy.h>
-
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-    {{EAP_PLUGIN_CONFIG_IMPLEMENTATION_UID}, 
-        reinterpret_cast<TProxyNewLPtr>( CEAPPluginConfiguration::NewL ) }
-    };
-
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-
-// -----------------------------------------------------------------------------
-// ImplementationGroupProxy
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( 
-                                                          TInt& aTableCount )
-    {
-    aTableCount = sizeof( ImplementationTable ) / 
-                  sizeof( TImplementationProxy );
-
-    return ImplementationTable;
-    }
-
-
-// End of file
--- a/wlansecuritysettings/wlaneapsettingsui/EapPluginConfig/src/EAPPluginList.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class REAPPluginList.
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-// INCLUDE FILES
-#include "EAPPluginList.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------
-// REAPPluginList::MovePos
-// ---------------------------------------------------------
-//
-void REAPPluginList::MovePos( TInt aOldPos, TInt aNewPos )
-    {
-    TEAPPluginInfo temp;
-    TInt i;
-    if ( aNewPos > aOldPos )
-        {
-        temp = (*this)[aOldPos];
-        for ( i = aOldPos; i < aNewPos; i++ )
-            {
-            (*this)[i] = (*this)[i + 1];
-            }
-        (*this)[aNewPos] = temp;
-        }
-    else if ( aNewPos < aOldPos )
-        {
-        temp = (*this)[aOldPos];
-        for ( i = aOldPos; i > aNewPos; i-- )
-            {
-            (*this)[i] = (*this)[i - 1];
-            }
-        (*this)[aNewPos] = temp;
-        }
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/data/EapSimUi.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP LEAP UI resource file
-*
-*/
-
-/*
-* %version: 17 %
-*/
-
-CHARACTER_SET   UTF8
-
-//  RESOURCE IDENTIFIER
-NAME EPSI
-
-//  INCLUDES
-#include <eikon.rh>
-#include "EapSimUi.hrh"   // Enums for these resources
-#include <eapsimui.loc>   // Localisation file
-#include <wlaneapsettingsui.loc>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-
-//  CONSTANTS  
-#define KUsernameMaxNameLength 255
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF16 { buf = ""; }
-
-
-RESOURCE CBA r_sim_softkeys_options_back_change
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = ESimUiCmdChange; txt = qtn_msk_change; }
-        };
-    }
-
-
-RESOURCE DIALOG r_sim_setting_dialog
-    {
-    flags = EAknDialogSelectionList | EEikDialogFlagWait;
-    buttons = r_sim_softkeys_options_back_change;
-    items = 
-        { 
-        DLG_LINE
-            {
-            id = ESimSettingsListBox;
-            type = EAknCtSettingListBox;
-            control = LISTBOX 
-                {
-                flags = EAknListBoxMenuList;
-                };
-            }
-        }; 
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_sim_username_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_sim_setting_edwin;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_sim_realm_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm;
-    type = EEikCtEdwin;
-    editor_resource_id = r_sim_setting_edwin;
-    }
-
-
-RESOURCE EDWIN r_sim_setting_edwin 
-    {
-    width = 9;
-    lines = 5;
-    maxlength = KUsernameMaxNameLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    flags = EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    }
-
-
-RESOURCE MENU_BAR r_sim_menubar
-    {
-    titles =
-        {
-        MENU_TITLE { menu_pane = r_sim_menu_pane; txt = ""; }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_sim_menu_pane
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = ESimUiCmdChange;
-            txt = qtn_options_change;
-            flags = EEikMenuItemAction;
-            },
-        MENU_ITEM
-            {
-            command = EAknCmdHelp;
-            txt = qtn_options_help;
-            },
-        MENU_ITEM
-            {
-            command = EAknCmdExit;
-            txt = qtn_options_exit;
-            }
-        };
-    }
-
-
-// Resource strings
-RESOURCE TBUF r_sim_settings_title          { buf = qtn_wlan_eap_sim_title; }
-RESOURCE TBUF r_sim_username_inusestring      \
-                                  { buf = qtn_wlan_eap_sett_username_inuse; }
-RESOURCE TBUF r_sim_username_inusestring_auto \
-                         { buf = qtn_wlan_eap_sett_username_inuse_from_sim; }
-RESOURCE TBUF r_sim_username_inusestring_conf \
-                             { buf = qtn_wlan_eap_sett_username_inuse_user; }
-RESOURCE TBUF r_sim_username_string     { buf = qtn_wlan_eap_sett_username; }
-RESOURCE TBUF r_sim_realm_inusestring         \
-                                     { buf = qtn_wlan_eap_sett_realm_inuse; }
-RESOURCE TBUF r_sim_realm_inusestring_auto    \
-                            { buf = qtn_wlan_eap_sett_realm_inuse_from_sim; }
-RESOURCE TBUF r_sim_realm_inusestring_conf    \
-                                { buf = qtn_wlan_eap_sett_realm_inuse_user; }
-RESOURCE TBUF r_sim_realm_string           { buf = qtn_wlan_eap_sett_realm; }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_sim_username_autouseconf_texts
-    {
-    setting_texts_resource = r_sim_username_autouseconf_texts_resource;
-    popped_up_texts_resource = r_sim_username_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_sim_username_autouseconf_texts_resource
-    {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_username_inuse_from_sim; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_username_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_sim_username_automatic_useconfigured_array
-    {
-    items =
-        {
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_from_sim; },
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_user; }
-        };
-    }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_sim_realm_autouseconf_texts
-    {
-    setting_texts_resource = r_sim_realm_autouseconf_texts_resource;
-    popped_up_texts_resource = r_sim_realm_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_sim_realm_autouseconf_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_realm_inuse_from_sim; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_realm_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_sim_realm_automatic_useconfigured_array
-    {
-    items=
-        {
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_from_sim; },
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_user; }
-        };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_sim_display_autouseconf_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm_inuse;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_sim_setting_enumerated_popup;
-    }
-
-
-RESOURCE POPUP_SETTING_LIST r_sim_setting_enumerated_popup
-    {
-    flags = EAknPopupSettingListFlagInitialised;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/inc/EapSimUi.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP SIM UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _EAPSIMUI_HRH_
-#define _EAPSIMUI_HRH_
-
-enum TEapSimUiMenuCommands
-    {
-    ESimUiCmdUndefined = 6000,
-    ESimUiCmdChange
-    };
-
-enum TEapSimUiNotes
-    {
-    TEapSimUiGeneralError = 6100
-    };
-
-enum TEapSimUiLines
-	{
-	ESimSettingsListBox = 6200
-	};
-
-enum TEapSimUiSettingIds
-	{
-	ESimSettingUsernameinUseSettingId=6300,
-	ESimSettingUsernameSettingId,
-	ESimSettingPageRealminUseSettingId,
-	ESimSettingRealmSettingId
-	};
-
-enum TEapSimUiSettingPageIds
-	{
-	ESimSettingPageUsernameinUse=6400,
-	ESimSettingPageUsername,
-	ESimSettingPageRealminUse,
-	ESimSettingPageRealm
-	};
-
-
-#endif  //_EAPSIMUI_HRH_
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/inc/EapSimUiSettingArray.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP SIM UI settings array
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPSIMUISETTINGARRAY_H_
-#define _EAPSIMUISETTINGARRAY_H_
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-#include "EapSimUi.hrh"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CEapSimSettingItemArray : public CBase
-    {
-    public:
-        static CEapSimSettingItemArray* NewL();
-        virtual ~CEapSimSettingItemArray();
-        CAknSettingItem* Item( TEapSimUiSettingPageIds aItem );
-        CAknSettingItemArray* Array();
-        void StoreSettingsL();
-        void AddTextItemL( TDes& aBuffer, TInt aId, TInt aTitleResource,
-                           TInt aSettingPageResource, TInt aAssociatedResource,
-                           TInt aOrdinal );
-
-        void AddPasswordItemL( TDes& aPassword, TInt aId, TInt aTitleResource,
-                               TInt aSettingPageResource, 
-                               TInt aAssociatedResource, TInt aOrdinal );
-
-        void AddBinarySettingItemL( TInt aSettingPageResourceId, 
-                                    TInt aTitleResourceId,
-                                    TInt aAssociatedResourceId,
-                                    TInt aOrdinal,
-                                    TBool& aModifiedValue );
-
-    protected:
-        CEapSimSettingItemArray();
-        void ConstructL();
-
-    private:
-        CAknSettingItemArray* iArray;
-    };
-
-#endif  // _EAPSIMUISETTINGARRAY_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/inc/EapSimUiView.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP SIM UI setting dialog
-*
-*/
-
-/*
-* %version: 16 %
-*/
-
-#ifndef _EAPSIMUIVIEW_H_
-#define _EAPSIMUIVIEW_H_
-
-// INCLUDES
-#include <AknDialog.h>
-#include <eikspane.h>
-#include <akntitle.h>
-#include <aknnavi.h>
-#include <aknsettingitemlist.h>
-#include <eiklbo.h>
-#include "EapSimUi.hrh"
-
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CSettingsListBoxItemDrawer;
-class CEapSimSettingItemArray;
-class CEapSimUiConnection;
-class CEapSimUiSimData;
-class CEapSimUiDataConnection;
-
-
-// CLASS DECLARATION
-
-/**
-*  Settings dialog class definition
-*/
-class CEapSimUiDialog : public CAknDialog,
-                        public MEikListBoxObserver
-    {
-    public:
-        CEapSimUiDialog( CEapSimUiConnection* aConnection, 
-                         TInt& aButtonId );
-
-        ~CEapSimUiDialog();
-
-        /**
-        * Create and launch dialog.
-        * @param aResourceId The resource ID of the dialog to load.
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( TInt aResourceId );
-
-        
-    public: // From MEikListBoxObserver
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );                
-
-
-    protected:
-        void PreLayoutDynInitL();
-        TBool OkToExitL( TInt aButtonId );
-
-    private:
-        void InitializeSettingsL();
-        void DrawSettingsListL();
-        void ChangeTitleL( TBool aIsStarted );
-        void ShowSettingPageL( TInt aCalledFromMenu ); 
-        void ProcessCommandL( TInt aCommand );
-        void SaveSettings();
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-
-    private:
-        CEapSimUiConnection* iConnection;
-        CEapSimUiSimData* iUiData;
-        CEapSimUiDataConnection* iDataConnection;
-        CEapSimSettingItemArray* iSettingArray;
-        CAknSettingStyleListBox* iSettingListBox;
-        CSettingsListBoxItemDrawer* iSettingListItemDrawer;
-        CAknNavigationControlContainer* iNaviPane;
-        CAknNavigationDecorator* iNaviDecorator;
-        HBufC* iPreviousText;        
-        TInt* iButtonId;
-        
-        // Tells the status of UI construction. TRUE if UI construction is completed.
-		TBool iIsUIConstructionCompleted;
-    };
-
-
-#endif // _EAPSIMUIVIEW_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/loc/eapsimui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-SIM authentication settings
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:UI title for main view
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sim_title      "EAP-SIM settings"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUi.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP SIM UI class
-*
-*/
-
-/*
-* %version: 15 %
-*/
-
-// INCLUDE FILES
-#include "EapSimUi.h"
-#include <EapSimUiConnection.h>
-#include "EapSimUiView.h"
-#include <eapsimui.rsg>
-#include <bautils.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "eapsimui.rsc" );
-
-
-// CLASS DECLARATION
-class TResourceFileCleanupItem
-    {
-    public:
-        CCoeEnv* iCoeEnv;
-        TInt iResourceFileOffset;
-    }; 
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupResourceFile
-// -----------------------------------------------------------------------------
-//
-static void CleanupResourceFile( TAny* aObject )
-    {
-    TResourceFileCleanupItem* item = 
-                        REINTERPRET_CAST( TResourceFileCleanupItem*, aObject );
-    item->iCoeEnv->DeleteResourceFile( item->iResourceFileOffset );
-    delete item;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapSimUi::CEapSimUi
-// -----------------------------------------------------------------------------
-//
-CEapSimUi::CEapSimUi( CEapSimUiConnection* aConnection ) 
-: iConnection( aConnection )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUi::NewL
-// -----------------------------------------------------------------------------
-//
-CEapSimUi* CEapSimUi::NewL( CEapSimUiConnection* aConnection )
-    {
-    CEapSimUi* self = new ( ELeave ) CEapSimUi( aConnection );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );    
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUi::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapSimUi::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUi::~CEapSimUi
-// -----------------------------------------------------------------------------
-//
-CEapSimUi::~CEapSimUi()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUi::InvokeUiL
-// -----------------------------------------------------------------------------
-//
-TInt CEapSimUi::InvokeUiL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    CCoeEnv* coeEnv = CCoeEnv::Static();
-    BaflUtils::NearestLanguageFile( coeEnv->FsSession(), fileName );
-
-    TResourceFileCleanupItem* item = new( ELeave ) TResourceFileCleanupItem;
-
-    item->iCoeEnv = coeEnv;
-    CleanupStack::PushL( TCleanupItem( CleanupResourceFile, item ) );
-    item->iResourceFileOffset = coeEnv->AddResourceFileL( fileName );
-
-    TInt buttonId;
-    CEapSimUiDialog* settingsDlg = new( ELeave ) CEapSimUiDialog( iConnection,
-                                                                  buttonId );
-    settingsDlg->ConstructAndRunLD( R_SIM_SETTING_DIALOG );
-
-    CleanupStack::PopAndDestroy();  // For resource file
-
-    return buttonId;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUiSettingArray.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP SIM UI settings array
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-// INCLUDE FILES
-#include "EapSimUiSettingArray.h"
-
-#include "EapSimUi.hrh"
-
-#include <aknsettingitemlist.h>
-#include <akntextsettingpage.h>
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::CEapSimSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapSimSettingItemArray::CEapSimSettingItemArray()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::NewL
-// -----------------------------------------------------------------------------
-//
-CEapSimSettingItemArray* CEapSimSettingItemArray::NewL() 
-    {
-    CEapSimSettingItemArray* self = new ( ELeave ) CEapSimSettingItemArray();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); 
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapSimSettingItemArray::ConstructL() 
-    {
-    iArray = new ( ELeave ) CAknSettingItemArray( 2, EFalse, 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::~CEapSimSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapSimSettingItemArray::~CEapSimSettingItemArray()
-    {
-    if( iArray ) 
-        {
-        // ResetAndDestroy()
-        iArray->ResetAndDestroy();
-        }    
-    delete iArray;   
-    iArray = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::Item
-// -----------------------------------------------------------------------------
-//
-CAknSettingItem* CEapSimSettingItemArray::Item( TEapSimUiSettingPageIds aId )
-    {
-    for( TInt i = 0; i < iArray->Count(); i++)
-        {
-        if( iArray->At( i )->Identifier() == aId )
-            {
-            return iArray->At( i );
-            }
-        }
-
-    __ASSERT_DEBUG( EFalse, User::Invariant() );
-    return NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::Array
-// -----------------------------------------------------------------------------
-//
-CAknSettingItemArray* CEapSimSettingItemArray::Array() 
-    {
-    return iArray;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::StoreSettingsL
-// -----------------------------------------------------------------------------
-//
-void CEapSimSettingItemArray::StoreSettingsL()
-    {
-    // Do what SettingItemList::StoreSettings would do. 
-    for( TInt i( 0 ); i < iArray->Count(); ++i) 
-        {
-        iArray->At( i )->StoreL();
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::AddTextItemL
-// -----------------------------------------------------------------------------
-//
-void CEapSimSettingItemArray::AddTextItemL( TDes& aBuffer, 
-                                            TInt aId, 
-                                            TInt aTitleResource, 
-                                            TInt aSettingPageResource,
-                                            TInt aAssociatedResource, 
-                                            TInt aOrdinal )
-    {
-    // Create new setting item
-    CAknTextSettingItem* settingItem = new( ELeave ) CAknTextSettingItem( aId, 
-                                                                    aBuffer );
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KNullDesC );
-    settingItem->SetSettingPageFlags( 
-                                    CAknTextSettingPage::EZeroLengthAllowed );
-    
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResource );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList,
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    CleanupStack::PopAndDestroy( itemTitle );
-
-    // Items are destroyed in destructor when resetting array
-    CleanupStack::Pop( settingItem ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimSettingItemArray::AddBinarySettingItemL
-// -----------------------------------------------------------------------------
-//
-void CEapSimSettingItemArray::AddBinarySettingItemL( 
-                                                TInt aSettingPageResourceId,
-                                                TInt aTitleResourceId, 
-                                                TInt aAssociatedResourceId,
-                                                TInt aOrdinal, 
-                                                TBool& aModifiedValue )
-    {
-    CAknSettingItem* settingItem = new ( ELeave ) 
-    CAknBinaryPopupSettingItem( 0, aModifiedValue );
-    CleanupStack::PushL( settingItem );
-
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResourceId );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResourceId, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResourceId );
-    iArray->AppendL( settingItem );
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapSim/ConfigUi/src/EapSimUiView.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,479 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP SIM UI settings dialog
-*
-*/
-
-/*
-* %version: 30 %
-*/
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include "EapSimUiView.h"
-#include "EapSimUi.hrh"
-#include <eapsimui.rsg>
-#include <akntextsettingpage.h>
-#include <aknsettingitemlist.h>
-#include "EapSimUiSettingArray.h"
-#include <aknnotewrappers.h> // For info message
-#include <aknnavide.h>
-#include <EapSimUiConnection.h>
-#include <EapSimUiDataConnection.h>
-#include <EapSimUiSimData.h>
-
-#include <featmgr.h>
-#include <hlplch.h>
-
-
-// CONSTANTS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
-
-_LIT( KEmptyString, "" );
-
-// MODULE DATA STRUCTURES
-enum 
-    {
-    EUsernameInUseItem = 0,
-    EUsernameItem,
-    ERealmInUseItem,
-    ERealmItem
-    };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::CEapSimUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapSimUiDialog::CEapSimUiDialog( CEapSimUiConnection* aConnection, 
-								  TInt& aButtonId ) 
-: CAknDialog(),
-  iConnection( aConnection ),
-  iUiData( 0 ), 
-  iDataConnection( 0 ), 
-  iSettingArray( 0 ), 
-  iSettingListBox( 0 ), 
-  iSettingListItemDrawer( 0 ), 
-  iNaviPane( 0 ), 
-  iNaviDecorator( 0 ), 
-  iPreviousText( 0 ), 
-  iButtonId( &aButtonId ),
-  iIsUIConstructionCompleted( EFalse )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CEapSimUiDialog::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CEapSimUiDialog::ConstructAndRunLD( TInt aResourceId )
-    {
-    CleanupStack::PushL( this );
-
-    iSettingArray = CEapSimSettingItemArray::NewL();
-
-    User::LeaveIfError( iConnection->Connect() );
-    iDataConnection = iConnection->GetDataConnection();
-    if ( iDataConnection == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-
-    User::LeaveIfError( iDataConnection->Open() );
-    User::LeaveIfError( iDataConnection->GetData( &iUiData ) );
-
-    FeatureManager::InitializeLibL();
-    
-    ConstructL( R_SIM_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-    
-    return CAknDialog::ExecuteLD( aResourceId );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::~CEapSimUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapSimUiDialog::~CEapSimUiDialog()
-    {
-    if ( iNaviDecorator )
-        {
-        delete iNaviDecorator;
-        iNaviDecorator = NULL;
-        }
-
-    if ( iSettingArray )
-        {
-        iSettingArray->Array()->ResetAndDestroy();
-        delete iSettingArray;
-        }
-
-    if ( iSettingListBox )
-        {
-        iSettingListBox = 0;
-        }
-
-    if ( iSettingListItemDrawer )
-        {
-        iSettingListItemDrawer = 0;
-        }
-
-    if ( iDataConnection )
-        {
-        iDataConnection->Close();
-        delete iDataConnection;
-        }
-
-    if ( iConnection )
-        {
-        iConnection->Close();
-        }
-
-    delete iPreviousText;
-    
-    FeatureManager::UnInitializeLib();
-    }
-
-// ---------------------------------------------------------
-// CEapSimUiDialog::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CEapSimUiDialog::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                   TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            OkToExitL( ESimUiCmdChange );         
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }    
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapSimUiDialog::PreLayoutDynInitL()
-    {
-    ChangeTitleL( ETrue );
-    
-    TUid naviPaneUid;
-    naviPaneUid.iUid = EEikStatusPaneUidNavi;
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( naviPaneUid );
-    if ( subPane.IsPresent()&&subPane.IsAppOwned() )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>( 
-                                        statusPane->ControlL( naviPaneUid ) );
-
-        // Set empty text to hide tabs.
-        iNaviDecorator = iNaviPane->CreateNavigationLabelL( KEmptyString );
-        iNaviPane->PushL( *iNaviDecorator );
-        }            
-        
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                        ControlOrNull( ESimSettingsListBox ) );
-    iSettingListItemDrawer=static_cast<CSettingsListBoxItemDrawer*>( 
-                                            iSettingListBox->ItemDrawer() );
-    iSettingListBox->SetMopParent( this );
-    iSettingListBox->CreateScrollBarFrameL( ETrue );
-    iSettingListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iSettingListBox->SetListBoxObserver( this );                                                
-    DrawSettingsListL();
-    
-    iIsUIConstructionCompleted = ETrue;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::ShowSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CEapSimUiDialog::ShowSettingPageL( TInt aCalledFromMenu ) 
-    {
-    TInt index = iSettingListBox->CurrentItemIndex();
-    CAknSettingItem* item = iSettingArray->Array()->At( index );
-    item->EditItemL( aCalledFromMenu );
-    item->StoreL();
-    DrawNow();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CEapSimUiDialog::OkToExitL( TInt aButtonId )
-    {
-    TBool ret( EFalse );
-    switch ( aButtonId )
-        {
-        case EEikBidOk:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                if ( iSettingListBox->IsFocused() )
-                    {
-                    ShowSettingPageL( EFalse );
-                    }
-                }
-            else
-                {
-                #if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapSimUiDialog::OkToExitL - UI not ready - Ignoring key press.\n") );
-				#endif
-                }
-            break;
-            }
-
-        case EAknSoftkeyOptions:
-            {
-            DisplayMenuL();
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                iDataConnection->Update();
-                ChangeTitleL( EFalse );
-                ret = ETrue;
-                }
-            break;
-            }
-        
-        case ESimUiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-				{
-    			ShowSettingPageL( EFalse );
-				}
-			else
-			    {
-				#if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapSimUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-				#endif						
-			    }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-
-    if ( ret )
-        {
-        *iButtonId = aButtonId;
-        }
-
-    return ret;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::DrawSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CEapSimUiDialog::DrawSettingsListL()
-    {  
-    iSettingArray->Array()->ResetAndDestroy();
-    TInt ordinal = 0;
-    iSettingArray->AddBinarySettingItemL( R_SIM_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_SIM_USERNAME_INUSESTRING, 
-                                          R_SIM_USERNAME_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetUseManualUsername() );
-
-    iSettingArray->AddTextItemL( iUiData->GetManualUsername(),
-                                 ESimSettingPageUsername,
-                                 R_SIM_USERNAME_STRING,
-                                 R_SIM_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    iSettingArray->AddBinarySettingItemL( R_SIM_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_SIM_REALM_INUSESTRING, 
-                                          R_SIM_REALM_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetUseManualRealm() );
-
-    iSettingArray->AddTextItemL( iUiData->GetManualRealm(),
-                                 ESimSettingUsernameSettingId,
-                                 R_SIM_REALM_STRING,
-                                 R_SIM_REALM_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    iSettingListBox->Model()->SetItemTextArray( iSettingArray->Array() );
-    iSettingListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iSettingArray->Array()->RecalculateVisibleIndicesL();
-    iSettingListBox->HandleItemAdditionL();
-    iSettingListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::ChangeTitleL
-// -----------------------------------------------------------------------------
-//
-void CEapSimUiDialog::ChangeTitleL( TBool aIsStarted )
-    {
-    TUid titlePaneUid;
-    titlePaneUid.iUid = EEikStatusPaneUidTitle;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( titlePaneUid );
-    
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        CAknTitlePane* titlePane = static_cast<CAknTitlePane*>( 
-                                        statusPane->ControlL( titlePaneUid ) );
-        if ( aIsStarted )
-            {
-            // Store previous application title text
-            const TDesC* prevText = titlePane->Text();    
-
-            iPreviousText = HBufC::NewL( prevText->Length() );
-            iPreviousText->Des().Append( *prevText );
-            TDesC* titleText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_SIM_SETTINGS_TITLE );
-            titlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText ); 
-            }
-        else
-            {
-            // Set calling application title text back
-            titlePane->SetTextL( *iPreviousText );
-            // pop navidecorator when exiting
-            iNaviPane->Pop( iNaviDecorator );    
-            }    
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CEapSimUiDialog::DynInitMenuPaneL( TInt aResourceId, 
-                                         CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aResourceId == R_SIM_MENU_PANE )
-        {
-        if ( aMenuPane && !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CEapSimUiDialog::ProcessCommandL( TInt aCommand )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    switch( aCommand )
-        {
-        case EAknCmdExit:
-            {
-            TryExitL( aCommand );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case ESimUiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-				{
-    			ShowSettingPageL( ETrue );
-				}
-			else
-			    {
-				#if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapSimUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-				#endif						
-			    }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapSimUiDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CEapSimUiDialog::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-    
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/data/EapTlsUi.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,413 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP TLS UI resource file
-*
-*/
-
-/*
-* %version: 18 %
-*/
-
-CHARACTER_SET   UTF8
-
-//  RESOURCE IDENTIFIER
-NAME ETLS
-
-//  INCLUDES
-#include <eikon.rh>
-#include "EapTlsUi.hrh"   // Enums for these resources
-#include <eaptlsui.loc>   // Localisation file
-#include <wlaneapsettingsui.loc>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-
-//  CONSTANTS  
-#define KUsernameMaxNameLength 255
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF16 { buf=""; }
-
-
-RESOURCE CBA r_tls_ui_softkeys_options_back_edit
-    {
-    buttons = 
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = ETlsUiCmdChange; txt = qtn_msk_change; }
-        };
-    }
-    
-    
-RESOURCE CBA r_tls_ui_softkeys_options_back_enable
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = ETlsUiCmdEnable; txt = qtn_msk_wlan_eap_cs_enable; }
-        };
-    }
-
-
-RESOURCE CBA r_tls_ui_softkeys_options_back_disable
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = ETlsUiCmdDisable; txt = qtn_msk_wlan_eap_cs_disable; }
-        };
-    }
-
-
-RESOURCE DIALOG r_tls_setting_dialog
-    {
-    flags = EEikDialogFlagFillAppClientRect | EEikDialogFlagCbaButtons | 
-            EEikDialogFlagWait | EEikDialogFlagNotifyEsc;
-    buttons = r_tls_ui_softkeys_options_back_edit;
-    pages = r_tls_pages;
-    }
-
-
-// ******* PAGES ************
-RESOURCE ARRAY r_tls_pages
-    {
-    items=
-        {
-        PAGE 
-            {
-            id = KEAPTLSSETTINGSPAGE;
-            text = qtn_wlan_eap_tab_settings; 
-            lines = r_tls_tab_settings; 
-            },
-
-        PAGE 
-            {
-            id = KEAPTLSCIPHERPAGE;
-            text = qtn_wlan_eap_tab_cipher_suites; 
-            lines = r_tls_tab_cipher_suites; 
-            }
-        };
-    }
-
-
-// ******* 1st page *********
-RESOURCE ARRAY r_tls_tab_settings
-    {
-    items=
-        {
-        DLG_LINE
-            {
-            id = ETlsSettingsListbox;
-            type = EAknCtSettingListBox;
-            control = LISTBOX 
-                {
-                flags = EAknListBoxMenuList;
-                };
-            }
-        };
-    }
-
-
-// ******* 2nd page *********
-RESOURCE ARRAY r_tls_tab_cipher_suites
-    {
-    items=
-         {
-         DLG_LINE
-            {
-            id = ETlsSettingsCipherSuiteListbox;
-            type = EAknCtSingleNumberListBox;
-            control = LISTBOX 
-                {
-                flags = EAknGenericListBoxFlags;
-                //array_id = r_tls_cipher_suite_array;
-                };
-            }
-         };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_tls_username_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_tls_setting_edwin;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_tls_realm_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm;
-    type = EEikCtEdwin;
-    editor_resource_id = r_tls_setting_edwin;
-    }
-
-
-RESOURCE EDWIN r_tls_setting_edwin 
-    {
-    flags = 0;
-    width = 9;
-    lines = 5;
-    maxlength = 255;
-    }
-
-
-RESOURCE MENU_BAR r_tls_menubar
-    {
-    titles =
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_tls_menu_pane;
-            txt = "";
-            }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_tls_menu_pane
-    {
-    items =
-        {
-        MENU_ITEM 
-            { 
-            command = ETlsUiCmdEnable;  
-            txt = qtn_wlan_options_eap_plugin_enable;
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = ETlsUiCmdDisable;
-            txt = qtn_wlan_options_eap_plugin_disable;
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = ETlsUiCmdChange;
-            txt = qtn_options_change;
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt = qtn_options_help; 
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdExit;
-            txt = qtn_options_exit; 
-            }
-        };
-    }
-
-
-// Resource strings
-RESOURCE TBUF r_tls_settings_title          { buf = qtn_wlan_eap_tls_title; }
-RESOURCE TBUF r_tls_username_inusestring      \
-                                  { buf = qtn_wlan_eap_sett_username_inuse; }
-RESOURCE TBUF r_tls_username_inusestring_auto \
-                        { buf = qtn_wlan_eap_sett_username_inuse_from_cert; }
-RESOURCE TBUF r_tls_username_inusestring_conf \
-                             { buf = qtn_wlan_eap_sett_username_inuse_user; }
-RESOURCE TBUF r_tls_username_string     { buf = qtn_wlan_eap_sett_username; }
-RESOURCE TBUF r_tls_realm_inusestring         \
-                                     { buf = qtn_wlan_eap_sett_realm_inuse; }
-RESOURCE TBUF r_tls_realm_inusestring_auto    \
-                           { buf = qtn_wlan_eap_sett_realm_inuse_from_cert; }
-RESOURCE TBUF r_tls_realm_inusestring_conf    \
-                                { buf = qtn_wlan_eap_sett_realm_inuse_user; }
-RESOURCE TBUF r_tls_realm_string           { buf = qtn_wlan_eap_sett_realm; }
-RESOURCE TBUF r_tls_user_cert_setting         \
-                                { buf = qtn_wlan_eap_sett_user_certificate; }
-RESOURCE TBUF r_tls_ca_cert_setting           \
-                                  { buf = qtn_wlan_eap_sett_ca_certificate; }
-RESOURCE TBUF r_tls_not_defined      { buf = qtn_wlan_eap_cert_not_defined; }
-RESOURCE TBUF r_tls_none_selection            \
-                                  { buf = qtn_wlan_eap_cert_none_selection; }
-RESOURCE TBUF r_tls_suite_rsarc4md5  { buf = qtn_wlan_eap_cipher_rsarc4md5; }
-RESOURCE TBUF r_tls_suite_rsarc4sha  { buf = qtn_wlan_eap_cipher_rsarc4sha; }
-RESOURCE TBUF r_tls_suite_rsa3dessha          \
-                                    { buf = qtn_wlan_eap_cipher_rsa3dessha; }
-RESOURCE TBUF r_tls_suite_dhersa3dessha       \
-                                 { buf = qtn_wlan_eap_cipher_dhersa3dessha; }
-RESOURCE TBUF r_tls_suite_dhedss3dessha       \
-                                 { buf = qtn_wlan_eap_cipher_dhedss3dessha; }
-RESOURCE TBUF r_tls_suite_rsaaessha  { buf = qtn_wlan_eap_cipher_rsaaessha; }
-RESOURCE TBUF r_tls_suite_dhersaaessha        \
-                                  { buf = qtn_wlan_eap_cipher_dhersaaessha; }
-RESOURCE TBUF r_tls_suite_dhedssaessha        \
-                                  { buf = qtn_wlan_eap_cipher_dhedssaessha; }
-
-RESOURCE TBUF r_tls_tls_privacy_string
-                                  { buf = qtn_wlan_eap_sett_tls_privacy; }
-
-
-// ********************************************
-// USERNAME IN USE AND REALM POPUP DEFINITION
-// ********************************************
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_tls_username_autouseconf_texts
-    {
-    setting_texts_resource = r_tls_username_autouseconf_texts_resource;
-    popped_up_texts_resource = r_tls_username_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_tls_username_autouseconf_texts_resource
-    {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_username_inuse_from_cert; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_username_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_tls_username_automatic_useconfigured_array
-    {
-    items =
-        {
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_from_cert; },
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_user; }
-        };
-    }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_tls_realm_autouseconf_texts
-    {
-    setting_texts_resource = r_tls_realm_autouseconf_texts_resource;
-    popped_up_texts_resource = r_tls_realm_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_tls_realm_autouseconf_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_realm_inuse_from_cert; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_realm_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_tls_realm_automatic_useconfigured_array
-    {
-    items=
-        {
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_from_cert; },
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_user; }
-        };
-    }
-
-RESOURCE ARRAY r_tls_tls_privacy_autouseconf_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_tls_privacy_off; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_tls_privacy_on; 
-            }
-        };
-    }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_tls_tls_privacy_autouseconf_texts
-    {
-    setting_texts_resource = r_tls_tls_privacy_autouseconf_texts_resource;
-    popped_up_texts_resource = r_tls_tls_privacy_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_tls_tls_privacy_automatic_useconfigured_array
-    {
-    items =
-        {
-        LBUF { txt = qtn_wlan_eap_sett_tls_privacy_off; },
-        LBUF { txt = qtn_wlan_eap_sett_tls_privacy_on; }
-        };
-    }
-
-RESOURCE AVKON_SETTING_PAGE r_tls_display_autouseconf_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_tls_setting_enumerated_popup;
-    }
-
-
-RESOURCE POPUP_SETTING_LIST r_tls_setting_enumerated_popup
-    {
-    flags = EAknPopupSettingListFlagInitialised;
-    }
-
-
-// ********************************************
-// USER&CA CERTIFICATES  POPUP DEFINITION
-// ********************************************
-RESOURCE AVKON_SETTING_PAGE r_radio_button_setting_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    type =  EAknSetListBox;
-    editor_resource_id= r_setting_listbox;
-    }
-
-
-RESOURCE LISTBOX r_setting_listbox 
-    {
-    flags = EEikListBoxMultipleSelection;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/inc/EapTlsUi.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP TLS UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _EAPTLSUI_HRH_
-#define _EAPTLSUI_HRH_
-
-enum TEapTlsUiMenuCommands
-    {
-    ETlsUiCmdUndefined = 6000,
-    ETlsUiCmdChange,
-    ETlsUiCmdEnable,
-    ETlsUiCmdDisable,
-	ETlsUiCmdMoveUp,
-    ETlsUiCmdMoveDown,
-	ETlsUiCmdViewDetails
-    };
-
-enum TEapTlsUiNotes
-    {
-    TEapTlsUiGeneralError = 6100
-    };
-
-enum TEapTlsUiLines
-	{
-	ETlsSettingsListBox = 6200
-	};
-
-enum TEapTlsUiSettingIds
-	{
-	ETlsSettingUsernameInUseId=6300,
-	ETlsSettingUsernameId,
-	ETlsSettingRealmInUseId,
-	ETlsSettingRealmId,
-	ETlsSettingTlsPrivacyId
-	};
-
-enum TEapTlsUiSettingPageIds
-	{
-	ETlsSettingPageSettings=6400,
-	ETlsSettingPageCipherSuites
-	};
-
-enum TEapTlsUiListBoxes
-	{
-	ETlsSettingsUserCertListbox=6500,
-	ETlsSettingsCaCertListbox,
-	ETlsSettingsCipherSuiteListbox,
-	ETlsSettingsEapTypeListbox,
-	ETlsSettingsListbox
-	};
-
-enum TEapTlsSettingItems
-	{
-	ETlsSettingsUserCert=6600,
-	ETlsSettingsCaCert,
-	ETlsTabSheetSettingsUsernameInUse,
-	ETlsTabSheetSettingsUsername,
-	ETlsTabSheetSettingsRealmInUse,
-	ETlsTabSheetSettingsRealm
-	};
-
-
-enum TEapTlsTests
-	{
-	ETlsTabSheetTest2=6600,
-	ETlsTabSheetTest3,
-	ETlsTabSheetTest4,
-	ETlsTabSheetTest5,
-	ETlsTabSheetTest6,
-	ETlsTabSheetTest7
-	};
-	
-// Constants that are used as page ids
-// TEapTlsUiSettingPageIds does not work for this purpose
-#define KEAPTLSSETTINGSPAGE 1
-#define KEAPTLSCIPHERPAGE   2
-
-#endif  //_EAPTLSUI_HRH_
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/inc/EapTlsUiSettingArray.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP TLS UI settings array
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPTLSUISETTINGARRAY_H_
-#define _EAPTLSUISETTINGARRAY_H_
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-#include "EapTlsUi.hrh"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CEapTlsSettingItemArray : public CBase
-    {
-    public:
-        static CEapTlsSettingItemArray* NewL();
-        virtual ~CEapTlsSettingItemArray();
-        CAknSettingItem* Item( TEapTlsUiSettingPageIds aItem );
-        CAknSettingItemArray* Array();
-        void StoreSettingsL();
-        void AddTextItemL( TDes& aBuffer, TInt aId, TInt aTitleResource, 
-                           TInt aSettingPageResource, TInt aAssociatedResource,
-                           TInt aOrdinal);
-
-        void AddBinarySettingItemL( TInt aSettingPageResourceId,
-                                    TInt aTitleResourceId,
-                                    TInt aAssociatedResourceId,
-                                    TInt aOrdinal,
-                                    TBool& aModifiedValue);
-
-    protected:
-        CEapTlsSettingItemArray();
-        void ConstructL();
-
-    private:
-        CAknSettingItemArray* iArray;
-    };
-
-#endif  // _EAPTLSUISETTINGARRAY_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/inc/EapTlsUiView.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP TLS UI setting dialog
-*
-*/
-
-/*
-* %version: 17 %
-*/
-
-#ifndef _EAPTLSUIVIEW_H_
-#define _EAPTLSUIVIEW_H_
-
-// INCLUDES
-#include <AknDialog.h>
-#include <eikspane.h> 
-#include <akntitle.h>
-#include <aknsettingitemlist.h>
-#include <aknlists.h>
-#include <aknselectionlist.h>
-#include <eiklbo.h>
-#include "EapTlsPeapUiTlsPeapData.h"
-#include "EapTlsUi.hrh"
-#include "EapTlsPeapUiCipherSuite.h"
-#include "EapTlsPeapUiEapType.h"
-#include "EapTlsPeapUiCertificate.h"
-#include "AbsEapTlsPeapUiCertificates.h"
-
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CSettingsListBoxItemDrawer;
-class CEapTlsSettingItemArray;
-class CEapTlsPeapUiConnection;
-class CEapTlsPeapUiDataConnection;
-class CEapTlsPeapUiCipherSuites;
-class CEapTlsPeapUiCertificates;
-class CEapTlsPeapUiEapTypes;
-
-
-// CLASS DECLARATION
-
-/**
-*  Settings dialog class definition
-*/
-class CEapTlsUiDialog : public CAknDialog, 
-                        public MEapTlsPeapUiCertificates,
-                        public MEikListBoxObserver
-    {
-    public:
-        CEapTlsUiDialog( CEapTlsPeapUiConnection* aConnection, 
-                         TInt& aButtonId );
-        ~CEapTlsUiDialog();
-     
-        /**
-        * Create and launch dialog.
-        * @param aResourceId The resource ID of the dialog to load.
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( TInt aResourceId );
-        
-        /**
-        * Chain into key event handler.
-        * @param aKeyEvent The event.
-        * @param aType The type of key event.
-        * @return Was the key consumed or not.
-        */
-        TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,
-                                          TEventCode aType);
-
-    public: // From MEikListBoxObserver
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );                
-
-
-    protected:
-        void PreLayoutDynInitL();
-        void PostLayoutDynInitL();
-        TBool OkToExitL( TInt aButtonId );
-        void ProcessCommandL( TInt aCommand );
-        void PageChangedL( TInt aPageId );
-
-    private:
-        void ChangeTitleL( TBool aIsStarted );
-        void DrawSettingsListL();
-        void ShowSettingPageL( TInt aCalledFromMenu ); 
-        TInt ShowRadioButtonSettingPageL( TInt aTitle, 
-                                          CDesCArrayFlat* aValues, 
-                                          TInt aCurrentItem );
-        void DrawCipherSuitesL();
-        void CompleteReadCertificates( const TInt aResult );
-        void CompleteUiConstructionL();
-        TInt CheckActiveUserCertificate();
-        TInt CheckActiveCaCertificate();
-        void UserCertificateHouseKeeping( TInt aSelected );
-        void CaCertificateHouseKeeping( TInt aSelected );
-        void SetIconsL();
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-        
-        void GetFullCertLabel( const SCertEntry& aCert, TDes& aFullLabel );
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-        CEapTlsPeapUiDataConnection* iDataConnection;
-        CEapTlsPeapUiCipherSuites* iCipherSuites;
-        CEapTlsPeapUiCertificates* iCertificates;
-
-        CEapTlsPeapUiTlsPeapData* iUiData;
-        CArrayFixFlat<TEapTlsPeapUiCipherSuite> * iUiCipherSuites;
-        CArrayFixFlat<TEapTlsPeapUiCertificate> * iUiUserCertificates;
-        CArrayFixFlat<TEapTlsPeapUiCertificate> * iUiCACertificates;
-                
-        CAknSingleNumberStyleListBox* iUserCertificateListBox;
-        CAknSingleNumberStyleListBox* iCaCertificateListBox;
-        CAknSingleGraphicStyleListBox* iCipherSuiteListBox;
-        CEapTlsSettingItemArray* iSettingArray;
-        CAknSettingStyleListBox* iSettingListBox;
-        CDesCArray* iCipherSuitesViewArray;
-        HBufC* iPreviousText;
-        TInt* iButtonId;
-        
-        // Tells the status of UI construction. TRUE if UI construction is completed.
-		TBool iIsUIConstructionCompleted;
-    };
-
-
-#endif //_EAPTLSUIVIEW_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/loc/eaptlsui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-TLS authentication settings
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:UI title for main view
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_tls_title      "EAP-TLS settings"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUi.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP TLS UI class
-*
-*/
-
-/*
-* %version: 15 %
-*/
-
-// INCLUDE FILES
-#include "EapTlsUi.h"
-#include "EapTlsPeapUiConnection.h"
-#include "EapTlsUiView.h"
-#include <eaptlsui.rsg>
-#include <bautils.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "eaptlsui.rsc" );
-
-
-// CLASS DECLARATION
-class TResourceFileCleanupItem
-    {
-    public:
-        CCoeEnv* iCoeEnv;
-        TInt iResourceFileOffset;
-    }; 
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupResourceFile
-// -----------------------------------------------------------------------------
-//
-static void CleanupResourceFile( TAny* aObject )
-    {
-    TResourceFileCleanupItem* item = 
-                        REINTERPRET_CAST( TResourceFileCleanupItem*, aObject );
-    item->iCoeEnv->DeleteResourceFile( item->iResourceFileOffset );
-    delete item;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapTlsUi::CEapTlsUi
-// -----------------------------------------------------------------------------
-//
-CEapTlsUi::CEapTlsUi( CEapTlsPeapUiConnection* aConnection ) 
-: iConnection( aConnection )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUi::NewL
-// -----------------------------------------------------------------------------
-//
-CEapTlsUi* CEapTlsUi::NewL( CEapTlsPeapUiConnection* aConnection )
-    {
-    CEapTlsUi* self = new ( ELeave ) CEapTlsUi( aConnection );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );    
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUi::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUi::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUi::~CEapTlsUi
-// -----------------------------------------------------------------------------
-//
-CEapTlsUi::~CEapTlsUi()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUi::InvokeUiL
-// -----------------------------------------------------------------------------
-//
-TInt CEapTlsUi::InvokeUiL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    CCoeEnv* coeEnv = CCoeEnv::Static();
-    BaflUtils::NearestLanguageFile( coeEnv->FsSession(), fileName );
-
-    TResourceFileCleanupItem* item = new( ELeave ) TResourceFileCleanupItem;
-
-    item->iCoeEnv = coeEnv;
-    CleanupStack::PushL( TCleanupItem( CleanupResourceFile, item ) );
-    item->iResourceFileOffset = coeEnv->AddResourceFileL( fileName );
-
-    TInt buttonId;
-    CEapTlsUiDialog* settingsDlg = new( ELeave ) CEapTlsUiDialog( iConnection,
-                                                                  buttonId );
-    settingsDlg->ConstructAndRunLD( R_TLS_SETTING_DIALOG );
-
-    CleanupStack::PopAndDestroy();  // For resource file
-
-    return buttonId;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUiSettingArray.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP TLS UI settings array
-*
-*/
-
-/*
-* %version: 13 %
-*/
-
-// INCLUDE FILES
-#include "EapTlsUiSettingArray.h"
-#include "EapTlsUi.hrh"
-#include <aknsettingitemlist.h>
-#include <akntextsettingpage.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::CEapTlsSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapTlsSettingItemArray::CEapTlsSettingItemArray()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::NewL
-// -----------------------------------------------------------------------------
-//
-CEapTlsSettingItemArray* CEapTlsSettingItemArray::NewL() 
-    {
-    CEapTlsSettingItemArray* self = new( ELeave ) CEapTlsSettingItemArray();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); // self
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsSettingItemArray::ConstructL() 
-    {
-    iArray = new( ELeave ) CAknSettingItemArray( 2, EFalse, 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::~CEapTlsSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapTlsSettingItemArray::~CEapTlsSettingItemArray()
-    {
-    if( iArray ) 
-        {
-        // ResetAndDestroy()
-        iArray->ResetAndDestroy();
-        }    
-    delete iArray;   
-    iArray = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::Item
-// -----------------------------------------------------------------------------
-//
-CAknSettingItem* CEapTlsSettingItemArray::Item( TEapTlsUiSettingPageIds aId )
-    {
-    for( TInt i = 0; i < iArray->Count(); i++ )
-        {
-        if( iArray->At( i )->Identifier() == aId )
-            {
-            return iArray->At( i );
-            }
-        }
-
-    __ASSERT_DEBUG( EFalse, User::Invariant() );
-    return NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::Array
-// -----------------------------------------------------------------------------
-//
-CAknSettingItemArray* CEapTlsSettingItemArray::Array() 
-    {
-    return iArray;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::StoreSettingsL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsSettingItemArray::StoreSettingsL()
-    {
-    // Do what SettingItemList::StoreSettings would do. 
-    for ( TInt i( 0 ); i < iArray->Count(); ++i) 
-        {
-        iArray->At( i )->StoreL();
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::AddTextItemL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsSettingItemArray::AddTextItemL( TDes& aBuffer, 
-                                            TInt aId, 
-                                            TInt aTitleResource, 
-                                            TInt aSettingPageResource,
-                                            TInt aAssociatedResource, 
-                                            TInt aOrdinal )
-    {
-    // Create new setting item
-    CAknTextSettingItem* settingItem = new( ELeave ) CAknTextSettingItem( aId,
-                                                                    aBuffer );
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KNullDesC );
-    settingItem->SetSettingPageFlags( 
-                                    CAknTextSettingPage::EZeroLengthAllowed );
-
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResource );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    
-    CleanupStack::PopAndDestroy( itemTitle );
-
-    // Items are destroyed in destructor when resetting array
-    CleanupStack::Pop( settingItem ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsSettingItemArray::AddBinarySettingItemL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsSettingItemArray::AddBinarySettingItemL( 
-                                                TInt aSettingPageResourceId,
-                                                TInt aTitleResourceId, 
-                                                TInt aAssociatedResourceId,
-                                                TInt aOrdinal, 
-                                                TBool& aModifiedValue )
-    {
-    CAknSettingItem* settingItem = new ( ELeave ) 
-    CAknBinaryPopupSettingItem( 0, aModifiedValue );
-    CleanupStack::PushL( settingItem );
-
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResourceId );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResourceId, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResourceId );
-    iArray->AppendL( settingItem );
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTls/ConfigUi/src/EapTlsUiView.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1252 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP TLS UI settings dialog
-*
-*/
-
-/*
-* %version: 42 %
-*/
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include "EapTlsUiView.h"
-#include "EapTlsUi.hrh"
-#include <eaptlsui.rsg>
-#include <akntextsettingpage.h>
-#include <aknsettingitemlist.h>
-#include "EapTlsUiSettingArray.h"
-#include <aknnavi.h>
-#include <akntabgrp.h>
-#include <aknnavide.h>
-#include <aknnotewrappers.h> // TEMPORARY, for info message...
-#include <aknradiobuttonsettingpage.h>
-#include <EapTlsPeapUiConnection.h>
-#include <EapTlsPeapUiDataConnection.h>
-#include <EapTlsPeapUiCipherSuites.h>
-#include <EapTlsPeapUiEapTypes.h>
-#include <EapTlsPeapUiCertificates.h>
-#include <AknIconArray.h>
-#include <AknsUtils.h>
-
-#include <featmgr.h>
-#include <hlplch.h>
-
-
-// CONSTANTS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
-
-static const TInt KSuiteArrayGranularity = 4;
-static const TInt KCertificateArrayGranularity = 5;
-static const TInt KMaxLengthOfSuiteName = 255;
-
-_LIT( KNameSeparator, " " );
-_LIT( KEmptyString, "" );
-
-/* This is the maximum length of a certificate's full name, includes
-label, primary and secondary names */
-const TUint32 KMaxFullCertLabelLength = KMaxCertLabelLength + 2 * 
-                                    KMaxNameLength + 1; // 1 is for separator.
-
-// MODULE DATA STRUCTURES
-enum TPageIds
-    {
-    ESettingsPage = 0,
-    ECipherSuitePage
-    };
-
-enum TSettingIds
-    {
-    EUserCertificateItem = 0,
-    ECaCertificateItem,
-    EUsernameInUseItem,
-    EUsernameItem,
-    ERealmInUseItem,
-    ERealmItem
-    };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::CEapTlsUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapTlsUiDialog::CEapTlsUiDialog( CEapTlsPeapUiConnection* aConnection, 
-								  TInt& aButtonId ) 
-: CAknDialog(),
-  iConnection( aConnection ),
-  iDataConnection( 0 ), 
-  iCipherSuites( 0 ), 
-  iCertificates( 0 ),
-  iUserCertificateListBox( 0 ), 
-  iCaCertificateListBox( 0 ), 
-  iCipherSuiteListBox( 0 ), 
-  iSettingArray( 0 ), 
-  iSettingListBox( 0 ), 
-  iCipherSuitesViewArray( 0 ), 
-  iPreviousText( 0 ), 
-  iButtonId( &aButtonId ),
-  iIsUIConstructionCompleted( EFalse )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CEapTlsUiDialog::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CEapTlsUiDialog::ConstructAndRunLD( TInt aResourceId )
-    {
-    CleanupStack::PushL( this );
-
-    iSettingArray = CEapTlsSettingItemArray::NewL();
-
-    User::LeaveIfError( iConnection->Connect() );
-    
-    // Basic data
-    iDataConnection = iConnection->GetDataConnection();
-    if ( iDataConnection == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iDataConnection->Open() );
-    User::LeaveIfError( iDataConnection->GetData( &iUiData ) );
-    
-    // Cipher suites
-    iCipherSuites = iConnection->GetCipherSuiteConnection();
-    if ( iCipherSuites == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iCipherSuites->Open() );
-    User::LeaveIfError( iCipherSuites->GetCipherSuites( &iUiCipherSuites ) );
-
-    iCipherSuitesViewArray = new( ELeave ) CDesCArrayFlat( 
-                                                    KSuiteArrayGranularity );
-
-    FeatureManager::InitializeLibL();
-    
-    ConstructL( R_TLS_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-    
-    return CAknDialog::ExecuteLD( aResourceId );
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CEapTlsUiDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                    TEventCode aType )
-    {
-    TKeyResponse result( EKeyWasNotConsumed );
-    
-    TInt pageId = ActivePageId();
-    if ( aType == EEventKey && pageId == KEAPTLSCIPHERPAGE )
-        {
-        TInt indexBefore = iCipherSuiteListBox->CurrentItemIndex();
-        
-        // Handle Enter key here, since it doesn't seem to convert into
-        // the proper command id via the normal route
-        // (maybe some Avkon support for Enter key is still missing in
-        // S60 3.2 2008_wk22)
-        if ( aKeyEvent.iCode == EKeyEnter )
-            {
-            if ( ( *iUiCipherSuites )[indexBefore].iIsEnabled )
-                {
-                OkToExitL( ETlsUiCmdDisable );
-                }
-            else
-                {
-                OkToExitL( ETlsUiCmdEnable );
-                }
-                
-            result = EKeyWasConsumed;
-            }
-        else
-            {        
-            result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-            }
-            
-        TInt indexAfter = iCipherSuiteListBox->CurrentItemIndex();
-
-        if ( indexBefore != indexAfter )
-            {
-            CEikButtonGroupContainer& cba = ButtonGroupContainer();
-            if( ( *iUiCipherSuites )[ indexAfter ].iIsEnabled )
-                {
-                cba.SetCommandSetL( R_TLS_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-                }
-            else
-                {
-                cba.SetCommandSetL( R_TLS_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                }
-            
-            cba.DrawDeferred();
-            }
-        }
-    else
-        {
-        result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-        }
-
-    return result;
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::~CEapTlsUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapTlsUiDialog::~CEapTlsUiDialog()
-    {
-    if ( iSettingArray )
-        {
-        iSettingArray->Array()->ResetAndDestroy();
-        }
-
-    delete iSettingArray;
-    iSettingListBox = 0;
-
-    iDataConnection->Close();
-    delete iDataConnection;
-
-    iCipherSuites->Close();
-    delete iCipherSuites;
-    
-    iCertificates->Close();
-    delete iCertificates;
-    
-    iConnection->Close();
-        
-    iCipherSuitesViewArray->Reset();
-    delete iCipherSuitesViewArray;
-    
-    delete iPreviousText;
-    
-    FeatureManager::UnInitializeLib();
-    }
-
-
-// ---------------------------------------------------------
-// CEapTlsUiDialog::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CEapTlsUiDialog::HandleListBoxEventL( CEikListBox* aListBox,
-                                           TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            if ( aListBox == iSettingListBox )
-                {
-                OkToExitL( ETlsUiCmdChange );                 
-                }
-                
-            else if ( aListBox == iCipherSuiteListBox )
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                if( iUiCipherSuites->At( index ).iIsEnabled )
-                    {
-                    OkToExitL( ETlsUiCmdDisable );
-                    }
-                else
-                    {
-                    OkToExitL( ETlsUiCmdEnable );
-                    }                 
-                }
-                
-            else
-                {
-                // Do nothing; we should never end up here
-                }
-        
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }    
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::PreLayoutDynInitL()
-    {
-    // Change title
-    ChangeTitleL( ETrue );
-    
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                    ControlOrNull( ETlsSettingsListbox ) );
-    iSettingListBox->SetComponentsToInheritVisibility( ETrue );
-
-    iCipherSuiteListBox = static_cast<CAknSingleGraphicStyleListBox*>( 
-                            ControlOrNull( ETlsSettingsCipherSuiteListbox ) );
-    iCipherSuiteListBox->SetComponentsToInheritVisibility( ETrue );
-        
-      // Certificates
-    iCertificates = iConnection->GetCertificateConnection( this );
-    User::LeaveIfError( iCertificates->Open() );
-    iCertificates->GetCertificates( &iUiUserCertificates, &iUiCACertificates );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::CompleteReadCertificates
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::CompleteReadCertificates( const TInt aResult )
-    {
-    if ( aResult == KErrNone ) // Certifiocates are received from core
-        {
-        TRAPD( err, CompleteUiConstructionL() );
-        if ( err != KErrNone)
-            {
-            TRAP_IGNORE( TryExitL( KErrCancel ) );
-            }
-        }
-    else
-        {
-        TRAP_IGNORE( TryExitL( KErrCancel ) );
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::CompleteUiConstructionL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::CompleteUiConstructionL()
-    {
-    // Initialize setting page 
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                        ControlOrNull( ETlsSettingsListbox ) );
-    iSettingListBox->SetMopParent( this );
-    iSettingListBox->CreateScrollBarFrameL( ETrue );
-    iSettingListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iSettingListBox->SetListBoxObserver( this );                                                
-    DrawSettingsListL();
-
-    // Initialize cipher suites page
-    iCipherSuiteListBox = static_cast<CAknSingleGraphicStyleListBox*>( 
-                            ControlOrNull( ETlsSettingsCipherSuiteListbox ) );
-    iCipherSuiteListBox->CreateScrollBarFrameL( ETrue );
-    iCipherSuiteListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iCipherSuiteListBox->UpdateScrollBarsL();
-    
-    iCipherSuiteListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iCipherSuiteListBox->SetListBoxObserver( this );    
-
-    //Following deletes internal array created from resources. 
-    // To prevent memory leak.
-    MDesCArray* internalArray = iCipherSuiteListBox->Model()->ItemTextArray();
-    delete internalArray;
-    
-    SetIconsL();
-    DrawCipherSuitesL();
-    
-    iIsUIConstructionCompleted = ETrue;
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::PostLayoutDynInitL()
-    {
-    TUid naviPaneUid;
-    naviPaneUid.iUid = EEikStatusPaneUidNavi;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( naviPaneUid );
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        CAknNavigationControlContainer* naviPane = 
-                                static_cast<CAknNavigationControlContainer*>(
-                                        statusPane->ControlL( naviPaneUid ) );
-        CAknNavigationDecorator* naviDecorator = naviPane->ResourceDecorator();
-        if ( naviDecorator )
-            {
-            CAknTabGroup* tabGroup = static_cast<CAknTabGroup*>( 
-                                        naviDecorator->DecoratedControl() );
-            tabGroup->SetActiveTabById( 0 ); 
-            tabGroup->SetTabFixedWidthL( KTabWidthWithOneTab );
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::ChangeTitleL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::ChangeTitleL( TBool aIsStarted )
-    {
-    TUid titlePaneUid;
-    titlePaneUid.iUid = EEikStatusPaneUidTitle;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( titlePaneUid );
-    
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        CAknTitlePane* titlePane = static_cast<CAknTitlePane*>( 
-                                        statusPane->ControlL( titlePaneUid ) );
-        if ( aIsStarted )
-            {
-            // Store previous application title text
-            const TDesC* prevText = titlePane->Text();    
-            iPreviousText = HBufC::NewL( prevText->Length() );
-            iPreviousText->Des().Append( *prevText );   
-            
-            TDesC* titleText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_TLS_SETTINGS_TITLE );
-            titlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText ); 
-            }
-        else
-            {
-            // Set calling application title text back
-            titlePane->SetTextL( *iPreviousText );    
-            }    
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CEapTlsUiDialog::OkToExitL( TInt aButtonId )
-    {
-    TBool ret( EFalse );
-    switch ( aButtonId )
-        {
-        case EEikBidOk:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                TPageIds index = static_cast<TPageIds>( ActivePageIndex() );
-                if ( index == ESettingsPage )
-                    {
-                    ShowSettingPageL( EFalse );
-                    }
-                }
-            else
-                {
-                #if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapTlsUiDialog::OkToExitL - UI not ready - Ignoring key press.\n") );
-				#endif
-                }
-            break;
-            }
-
-        case EAknSoftkeyOptions:
-            {
-            DisplayMenuL();
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                iDataConnection->Update();
-                ChangeTitleL( EFalse );
-                ret = ETrue;
-                }
-            break;
-            }
-            
-        case ETlsUiCmdChange:
-            {
-            TPageIds index = static_cast<TPageIds>( ActivePageIndex() );
-            if ( index == ESettingsPage )
-                {
-                if( iIsUIConstructionCompleted )
-    				{
-        			ShowSettingPageL( EFalse );
-    				}
-    			else
-    			    {
-    				#if defined(_DEBUG) || defined(DEBUG)
-    				RDebug::Print(_L("CEapPeapUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-    				#endif
-    			    }
-                }
-            break;
-            }
-        case ETlsUiCmdEnable:
-        case ETlsUiCmdDisable:
-            {
-            ProcessCommandL( aButtonId );
-            ret = EFalse;
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-
-    if ( ret )
-        {
-        *iButtonId = aButtonId;
-        }
-
-    return ret;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::DrawSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::DrawSettingsListL()
-    {  
-    iSettingArray->Array()->ResetAndDestroy();
-    TInt ordinal = 0;
-
-    TInt activeUserCertificate = CheckActiveUserCertificate();
-    TBuf<KMaxFullCertLabelLength> aActiveuserCertificateName = KEmptyString();
-    if ( activeUserCertificate != KErrNotFound )
-        {
-		TBuf<KMaxFullCertLabelLength> text;
-		GetFullCertLabel( 
-                iUiUserCertificates->At( activeUserCertificate ).iCertEntry,
-                text );
-		aActiveuserCertificateName.Copy( text );		
-        }
-    else
-        {
-        TDesC* notDefinedText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_TLS_NOT_DEFINED );
-        aActiveuserCertificateName.Copy( *notDefinedText );
-        CleanupStack::PopAndDestroy( notDefinedText );
-        }
-
-    iSettingArray->AddTextItemL( aActiveuserCertificateName,
-                                 ETlsSettingsUserCert,
-                                 R_TLS_USER_CERT_SETTING,
-                                 R_TLS_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    TInt activeCaCertificate = CheckActiveCaCertificate();
-    TBuf<KMaxFullCertLabelLength> aActiveCaCertificateName = KEmptyString();
-    if ( activeCaCertificate != KErrNotFound )
-        {
-		TBuf<KMaxFullCertLabelLength> text;
-		GetFullCertLabel(
-                    iUiCACertificates->At( activeCaCertificate ).iCertEntry, 
-                    text );
-		aActiveCaCertificateName.Copy( text );				
-        }
-    else
-        {
-        TDesC* notDefinedText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_TLS_NOT_DEFINED );
-        aActiveCaCertificateName.Copy( *notDefinedText );
-        CleanupStack::PopAndDestroy( notDefinedText );                
-        }
-
-    iSettingArray->AddTextItemL( aActiveCaCertificateName,
-                                 ETlsSettingsCaCert,
-                                 R_TLS_CA_CERT_SETTING,
-                                 R_TLS_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    iSettingArray->AddBinarySettingItemL( R_TLS_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_TLS_USERNAME_INUSESTRING, 
-                                          R_TLS_USERNAME_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetUseManualUsername() );
-                                
-    iSettingArray->AddTextItemL( iUiData->GetManualUsername(),
-                                 ETlsTabSheetSettingsUsername,
-                                 R_TLS_USERNAME_STRING,
-                                 R_TLS_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    iSettingArray->AddBinarySettingItemL( R_TLS_DISPLAY_AUTOUSECONF_PAGE, 
-                                          R_TLS_REALM_INUSESTRING, 
-                                          R_TLS_REALM_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetUseManualRealm() );    
-
-    iSettingArray->AddTextItemL( iUiData->GetManualRealm(),
-                                 ETlsTabSheetSettingsRealm,
-                                 R_TLS_REALM_STRING,
-                                 R_TLS_REALM_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    iSettingArray->AddBinarySettingItemL( R_TLS_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_TLS_TLS_PRIVACY_STRING, 
-                                          R_TLS_TLS_PRIVACY_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetTlsPrivacy() );
-        
-    iSettingListBox->Model()->SetItemTextArray( iSettingArray->Array() );
-    iSettingListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iSettingArray->Array()->RecalculateVisibleIndicesL();
-    iSettingListBox->HandleItemAdditionL();
-    iSettingListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::DynInitMenuPaneL( TInt aResourceId, 
-                                        CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aMenuPane && aResourceId == R_TLS_MENU_PANE )
-        {
-        if ( !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-
-        TPageIds index = static_cast<TPageIds>( ActivePageIndex() );
-        if ( index == ESettingsPage )
-            {
-            aMenuPane->SetItemDimmed( ETlsUiCmdEnable,  ETrue );
-            aMenuPane->SetItemDimmed( ETlsUiCmdDisable, ETrue );
-            }
-        else if ( index == ECipherSuitePage )
-            {
-            aMenuPane->SetItemDimmed( ETlsUiCmdChange, ETrue );
-
-            if ( iCipherSuitesViewArray->Count() > 0 )
-                {
-                TInt currIndex = iCipherSuiteListBox->CurrentItemIndex();
-                TBool enabled = iUiCipherSuites->At( currIndex ).iIsEnabled;
-
-                // Hide either "Enable" or "Disable", as appropriate.
-                aMenuPane->SetItemDimmed( ETlsUiCmdEnable,  enabled );
-                aMenuPane->SetItemDimmed( ETlsUiCmdDisable, !enabled );
-                }
-            else
-                {
-                aMenuPane->SetItemDimmed( ETlsUiCmdEnable,  ETrue );
-                aMenuPane->SetItemDimmed( ETlsUiCmdDisable, ETrue );
-                }
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::ProcessCommandL( TInt aCommand )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    TPageIds pageIndex = static_cast<TPageIds>( ActivePageIndex() );
-    switch( aCommand )
-        {
-        case EAknCmdExit:
-            {
-            TryExitL( aCommand );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case ETlsUiCmdChange:
-            {
-            if ( pageIndex == ESettingsPage )
-                {
-                if( iIsUIConstructionCompleted )
-    				{
-        			ShowSettingPageL( ETrue );
-    				}
-    			else
-    			    {
-    				#if defined(_DEBUG) || defined(DEBUG)
-    				RDebug::Print(_L("CEapTlsUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-    				#endif						
-    			    }
-                }    
-            break;
-            }
-
-        case ETlsUiCmdEnable:
-            {
-            if ( pageIndex == ECipherSuitePage )    // Safety check in tls.
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                iUiCipherSuites->At( index ).iIsEnabled = ETrue;
-                iCipherSuites->Update();
-                DrawCipherSuitesL();
-                CEikButtonGroupContainer& cba = ButtonGroupContainer();
-                cba.SetCommandSetL( R_TLS_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-                cba.DrawDeferred();
-                }
-            break;
-            }
-
-        case ETlsUiCmdDisable:
-            {
-            if ( pageIndex == ECipherSuitePage )    // Safety check in tls.
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                iUiCipherSuites->At( index ).iIsEnabled = EFalse;
-                iCipherSuites->Update();                
-                DrawCipherSuitesL();
-                CEikButtonGroupContainer& cba = ButtonGroupContainer();
-                cba.SetCommandSetL( R_TLS_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                cba.DrawDeferred();
-                }            
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::PageChangedL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::PageChangedL( TInt aPageId )
-    {
-    if ( !iIsUIConstructionCompleted )
-        {
-        return;
-        }
-    
-    if ( aPageId == KEAPTLSSETTINGSPAGE )
-        {
-        if (iSettingListBox->ScrollBarFrame())
-            {
-            iSettingListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(ETrue);
-            }
-        if (iCipherSuiteListBox->ScrollBarFrame())
-            {
-            iCipherSuiteListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        }
-
-    else if ( aPageId == KEAPTLSCIPHERPAGE )
-        {
-        if (iSettingListBox->ScrollBarFrame())
-            {
-            iSettingListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iCipherSuiteListBox->ScrollBarFrame())
-            {
-            iCipherSuiteListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(ETrue);
-            }
-        }
-        
-    CEikButtonGroupContainer& cba = ButtonGroupContainer();
-    if( aPageId == KEAPTLSSETTINGSPAGE )
-        {
-        cba.SetCommandSetL( R_TLS_UI_SOFTKEYS_OPTIONS_BACK_EDIT );
-        }
-    else if( aPageId == KEAPTLSCIPHERPAGE )
-        {
-        TInt index = iCipherSuiteListBox->CurrentItemIndex();
-        if( ( *iUiCipherSuites )[ index ].iIsEnabled )
-            {
-            cba.SetCommandSetL( R_TLS_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-            }
-        else
-            {
-            cba.SetCommandSetL( R_TLS_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-            }
-        }
-    cba.DrawDeferred();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::ShowSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::ShowSettingPageL( TInt aCalledFromMenu ) 
-    {
-    TInt index = iSettingListBox->CurrentItemIndex();
-    if ( index == EUserCertificateItem )
-        {
-        TInt activeUserCertificate = CheckActiveUserCertificate();
-        CDesCArrayFlat* tempArray = new( ELeave )CDesCArrayFlat( 
-                                                KCertificateArrayGranularity );
-        CleanupStack::PushL( tempArray );
-    
-        TDesC* noneText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_TLS_NONE_SELECTION );
-        tempArray->InsertL( 0, *noneText );
-        CleanupStack::PopAndDestroy( noneText );
-    
-        for ( TInt i = 0; i < iUiUserCertificates->Count() ; i++ )
-            {
-            TEapTlsPeapUiCertificate certificate = 
-                                                iUiUserCertificates->At( i );
-            SCertEntry entry = certificate.iCertEntry;
-			TBuf<KMaxFullCertLabelLength> text;
-			GetFullCertLabel( entry, text);
-			tempArray->InsertL( i+1, text );
-            }
-
-        TInt selected( 0 );    
-        if ( activeUserCertificate == KErrNotFound )
-            {
-            selected = ShowRadioButtonSettingPageL( R_TLS_USER_CERT_SETTING, 
-                                                    tempArray, 0 );
-            }
-        else 
-            {
-            selected = ShowRadioButtonSettingPageL( R_TLS_USER_CERT_SETTING, 
-                                                    tempArray, 
-                                                    activeUserCertificate+1 );
-                                    //Plus 1 cause we added 'none' selection
-            }
-
-        CleanupStack::PopAndDestroy( tempArray );
-        UserCertificateHouseKeeping( selected );    
-        iCertificates->Update();
-        DrawSettingsListL(); // List must be drawn again at this stage
-        }
-    else if ( index == ECaCertificateItem )
-        {
-        TInt activeCaCertificate = CheckActiveCaCertificate();
-
-        CDesCArrayFlat* tempArray = new( ELeave )CDesCArrayFlat( 
-                                                KCertificateArrayGranularity );
-        CleanupStack::PushL( tempArray );
-
-        TDesC* noneText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_TLS_NONE_SELECTION );
-        tempArray->InsertL( 0, *noneText );
-        CleanupStack::PopAndDestroy( noneText );
-
-        for ( TInt i = 0; i < iUiCACertificates->Count(); i++ )
-            {
-            TEapTlsPeapUiCertificate certificate = iUiCACertificates->At( i );
-            SCertEntry entry = certificate.iCertEntry;
-            TBuf<KMaxFullCertLabelLength> text;
-			GetFullCertLabel( entry, text );
-			tempArray->InsertL( i+1, text );
-            }
-
-        TInt selected( 0 );
-        if ( activeCaCertificate == KErrNotFound )
-            {
-            selected = ShowRadioButtonSettingPageL( R_TLS_CA_CERT_SETTING, 
-                                                    tempArray, 0 );
-            }
-        else
-            {
-            selected = ShowRadioButtonSettingPageL( R_TLS_CA_CERT_SETTING, 
-                                                    tempArray, 
-                                                    activeCaCertificate+1 );
-                                    //Plus 1 cause we added 'none' selection
-            }
-
-        CleanupStack::PopAndDestroy( tempArray );
-        CaCertificateHouseKeeping( selected );
-        iCertificates->Update();
-        DrawSettingsListL(); // List must be drawn again at this stage
-        }
-    else
-        {
-        CAknSettingItem* item = iSettingArray->Array()->At( index );
-        item->EditItemL( aCalledFromMenu );
-        item->StoreL();
-        }
-    DrawNow();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::ShowRadioButtonSettingPageL
-// -----------------------------------------------------------------------------
-//
-TInt CEapTlsUiDialog::ShowRadioButtonSettingPageL( TInt aTitle, 
-                                                   CDesCArrayFlat* aValues,
-                                                   TInt aCurrentItem )
-    {
-    // title of the dialog
-    HBufC* title = iCoeEnv->AllocReadResourceLC( aTitle );
-
-    // We have everything to create dialog
-    CAknRadioButtonSettingPage* dlg = new( ELeave )CAknRadioButtonSettingPage(
-                                                R_RADIO_BUTTON_SETTING_PAGE,
-                                                aCurrentItem, 
-                                                aValues );
-    CleanupStack::PushL( dlg );
-    dlg->SetSettingTextL( *title ); 
-    CleanupStack::Pop( dlg ); 
-    dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged );
-    CleanupStack::PopAndDestroy( title ); 
-    // index must be re-turned upside down, because options list is upside down
-    return aCurrentItem;
-    }
-  
- 
-  
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::DrawCipherSuitesL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::DrawCipherSuitesL()
-    {
-    iCipherSuitesViewArray->Reset();
-    TInt listCount( 0 );
-    TBuf<KMaxLengthOfSuiteName> temp;
-
-    for ( TInt i = 0; i < iUiCipherSuites->Count() ; i++ )
-        {
-        temp.Zero();
-        _LIT( KTab, "\t" );
-        temp.Append( KTab );
-        TEapTlsPeapUiCipherSuite suite = iUiCipherSuites->At( i );
-        TUint32 suiteId = suite.iCipherSuite;
-
-        switch ( suiteId )
-            {
-            case 0x0004:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TLS_SUITE_RSARC4MD5 );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x0005:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TLS_SUITE_RSARC4SHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x000a:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TLS_SUITE_RSA3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x0016:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TLS_SUITE_DHERSA3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );            
-                break;
-                }
-
-            case 0x0013:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TLS_SUITE_DHEDSS3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );        
-                break;
-                }
-
-            case 0x002F:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TLS_SUITE_RSAAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );                
-                break;
-                }
-
-            case 0x0032:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TLS_SUITE_DHERSAAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );        
-                break;
-                }
-
-            case 0x0033:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TLS_SUITE_DHEDSSAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );                     
-                break;
-                }
-
-            default:
-                {
-                temp.Append( KEmptyString );                                    
-                break;
-                }
-
-            }
-
-        if (iUiCipherSuites->At( i ).iIsEnabled)
-            {
-            // Add mark icon to indicate that the suite is enabled
-            _LIT( KTab0, "\t0" );
-            temp.Append( KTab0 );    
-            }
-
-        iCipherSuitesViewArray->InsertL( listCount, temp );
-        listCount++;                
-        }
-
-    iCipherSuiteListBox->Model()->SetItemTextArray( iCipherSuitesViewArray );
-    iCipherSuiteListBox->HandleItemAdditionL();
-    iCipherSuiteListBox->DrawDeferred();
-    iCipherSuiteListBox->UpdateScrollBarsL();        
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::CheckActiveUserCertificate
-// -----------------------------------------------------------------------------
-//
-TInt CEapTlsUiDialog::CheckActiveUserCertificate()
-    {
-    for ( TInt i = 0; i < iUiUserCertificates->Count(); i++ )
-        {
-        if ( iUiUserCertificates->At( i ).iIsEnabled )
-            {
-            return i;
-            }
-        }
-
-    return KErrNotFound;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::CheckActiveCaCertificate
-// -----------------------------------------------------------------------------
-//
-TInt CEapTlsUiDialog::CheckActiveCaCertificate()
-    {
-    for ( TInt i = 0; i < iUiCACertificates->Count(); i++ )
-        {
-        if ( iUiCACertificates->At( i ).iIsEnabled )
-            {
-            return i;
-            }
-        }
-
-    return KErrNotFound;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::UserCertificateHouseKeeping
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::UserCertificateHouseKeeping( TInt aSelected )
-    {
-    for ( TInt i = 0; i < iUiUserCertificates->Count(); i++ )
-        {
-        iUiUserCertificates->At( i ).iIsEnabled = EFalse;
-        }
-
-    if ( aSelected != 0 ) // Zero index is none
-        {
-        iUiUserCertificates->At( aSelected-1 ).iIsEnabled = ETrue;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::CaCertificateHouseKeeping
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::CaCertificateHouseKeeping( TInt aSelected )
-    {
-    for ( TInt i = 0; i < iUiCACertificates->Count(); i++ )
-        {
-        iUiCACertificates->At( i ).iIsEnabled = EFalse;
-        }
-
-    if ( aSelected != 0 ) // Zero index is none
-        {        
-        iUiCACertificates->At( aSelected-1 ).iIsEnabled = ETrue;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::SetIconsL
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::SetIconsL()
-    {
-    CArrayPtr< CGulIcon >* icons = new( ELeave ) CAknIconArray( 1 );
-    CleanupStack::PushL( icons );
-
-    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-
-/*    icons->AppendL( AknsUtils::CreateGulIconL( skinInstance, 
-                                        KAknsIIDQgnIndiMarkedAdd,
-                                        AknIconUtils::AvkonIconFileName(),
-                                        EMbmAvkonQgn_indi_marked_add, 
-                                        EMbmAvkonQgn_indi_marked_add_mask ) );
-*/
-
-    CGulIcon* icon = CGulIcon::NewLC();
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* mask = NULL;    
-    AknsUtils::CreateColorIconL( skinInstance,
-                                 KAknsIIDQgnIndiMarkedAdd, 
-                                 KAknsIIDQsnIconColors, 
-                                 EAknsCIQsnIconColorsCG13, 
-                                 bitmap, 
-                                 mask, 
-                                 AknIconUtils::AvkonIconFileName(),
-                                 EMbmAvkonQgn_indi_marked_add, 
-                                 EMbmAvkonQgn_indi_marked_add_mask,
-                                 KRgbBlack );
-    icon->SetBitmap( bitmap );
-    icon->SetMask( mask );    
-    icons->AppendL( icon );
-                
-    CleanupStack::Pop( icon ); 
-    CleanupStack::Pop( icons ); // icons
-
-    iCipherSuiteListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTlsUiDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CEapTlsUiDialog::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-
-
-void CEapTlsUiDialog::GetFullCertLabel( const SCertEntry& aCert, 
-                                        TDes& aFullLabel )
-    {
-    TInt length = 0;
-
-	// For label.
-    length += aCert.iLabel.Length();
-
-	// For separator between label and primary name.    
-    length += KNameSeparator.iTypeLength;    
-    
-    // For primary name.
-    length += aCert.iPrimaryName.Length();
-
-    if ( !( aCert.iLabel.Length() ) )
-        {	
-    	// For secondary name.
-	    length += aCert.iSecondaryName.Length();
-        }
-    
-    if( length > aFullLabel.MaxLength() )
-        {
-#if defined(_DEBUG) || defined(DEBUG)
-		RDebug::Print(_L("CEapTlsUiDialog::GetFullCertLabel - ERROR! Length Mismatch in Certificate's full name\n") );
-#endif
-        }
-
-    HBufC* label = NULL;
-    TRAPD(err, label = HBufC::NewL( length ));
-    if (err)
-        {
-#if defined(_DEBUG) || defined(DEBUG)
-        RDebug::Print(_L("CEapTlsUiDialog::GetFullCertLabel - ERROR! LEAVE: HBufC::NewL\n") );
-#endif
-        return;
-        }
-    label->Des().Append( aCert.iLabel );
-
-    label->Des().Append( KNameSeparator );
-    label->Des().Append( aCert.iPrimaryName );
-
-    if ( !( aCert.iLabel.Length() ) )
-        {
-    	// Secondary name, only if no label. Certificate manager does the same way.
-	    label->Des().Append( aCert.iSecondaryName );
-        }
-            
-	aFullLabel.Copy( label->Des().Left( aFullLabel.MaxLength() ) );   
-    
-    delete label;
-    label = NULL;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/data/EapTtlsUi.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,473 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP TTLS UI resource file
-*
-*/
-
-/*
-* %version: 20 %
-*/
-
-CHARACTER_SET   UTF8
-
-//  RESOURCE IDENTIFIER
-NAME ETTL
-
-//  INCLUDES
-#include <eikon.rh>
-#include "EapTtlsUi.hrh"   // Enums for these resources
-#include <eapttlsui.loc>   // Localisation file
-#include <wlaneapsettingsui.loc>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-
-//  CONSTANTS  
-#define KUsernameMaxNameLength 255
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF16 { buf=""; }
-
-
-RESOURCE CBA r_ttls_ui_softkeys_options_back_edit
-    {
-    buttons = 
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = ETtlsUiCmdChange; txt = qtn_msk_change; }
-        };
-    }
-    
-    
-RESOURCE CBA r_ttls_ui_softkeys_options_back_configure
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = ETtlsUiCmdConfigure; txt = qtn_msk_wlan_eap_configure; }
-        };
-    }
-    
-    
-RESOURCE CBA r_ttls_ui_softkeys_options_back_enable
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = ETtlsUiCmdEnable; txt = qtn_msk_wlan_eap_cs_enable; }
-        };
-    }
-
-
-RESOURCE CBA r_ttls_ui_softkeys_options_back_disable
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = ETtlsUiCmdDisable; txt = qtn_msk_wlan_eap_cs_disable; }
-        };
-    }
-
-
-RESOURCE DIALOG r_ttls_setting_dialog
-    {
-    flags = EEikDialogFlagFillAppClientRect | EEikDialogFlagCbaButtons | 
-            EEikDialogFlagWait | EEikDialogFlagNotifyEsc;
-    buttons = r_ttls_ui_softkeys_options_back_edit;
-    pages = r_ttls_pages;
-    }
-
-
-RESOURCE ARRAY r_ttls_pages
-    {
-    items=
-        {
-        PAGE 
-            {
-            id = KEAPTTLSSETTINGSPAGE;
-            text = qtn_wlan_eap_tab_settings; 
-            lines = r_ttls_tab_settings; 
-            },
-
-        PAGE 
-            {
-            id = KEAPTTLSEAPPAGE;
-            text = qtn_wlan_eap_tab_eap_types; 
-            lines = r_ttls_tab_eap_types; 
-            },
-
-        PAGE 
-            {
-            id = KEAPTTLSCIPHERPAGE;
-            text = qtn_wlan_eap_tab_cipher_suites; 
-            lines = r_ttls_tab_cipher_suites; 
-            }
-        };
-    }
-
-
-// ******* PAGES ************
-// ******* 1st page *********
-RESOURCE ARRAY r_ttls_tab_settings
-    {
-    items =
-        {
-        DLG_LINE
-            {
-            id = ETtlsSettingsListbox;
-            type = EAknCtSettingListBox;
-            control = LISTBOX 
-                {
-                flags = EAknListBoxMenuList;
-                };
-            }
-        };
-    }
-
-
-// ******* 2nd page *********
-RESOURCE ARRAY r_ttls_tab_eap_types
-    {
-    items =
-         {
-         DLG_LINE
-            {
-            id = ETtlsSettingsEapTypeListbox;
-            type = EAknCtSingleNumberListBox;
-            control = LISTBOX 
-                {
-                flags = EAknGenericListBoxFlags;
-                };
-            }
-        };
-    }
-
-
-// ******* 3rd page *********
-RESOURCE ARRAY r_ttls_tab_cipher_suites
-    {
-    items =
-        {
-        DLG_LINE
-            {
-            id = ETtlsSettingsCipherSuiteListbox;
-            type = EAknCtSingleNumberListBox;
-            control = LISTBOX 
-                {
-                flags = EAknGenericListBoxFlags;
-                };
-            }
-        };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_ttls_username_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_ttls_setting_edwin;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_ttls_realm_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm;
-    type = EEikCtEdwin;
-    editor_resource_id = r_ttls_setting_edwin;
-    }
-
-
-RESOURCE EDWIN r_ttls_setting_edwin 
-    {
-    flags = 0;
-    width = 9;
-    lines = 5;
-    maxlength = 255;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_radio_button_setting_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    type =  EAknSetListBox;
-    editor_resource_id = r_setting_listbox;
-    }
-
-
-RESOURCE LISTBOX r_setting_listbox 
-    {
-    flags = EEikListBoxMultipleSelection;
-    }
-
-
-
-RESOURCE MENU_BAR r_ttls_menubar
-    {
-    titles =
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_ttls_menu_pane; 
-            txt = ""; 
-            }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_ttls_menu_pane
-    {
-    items =
-        {
-        MENU_ITEM 
-            { 
-            command = ETtlsUiCmdConfigure;
-            txt = qtn_wlan_options_eap_plugin_configure;
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = ETtlsUiCmdEnable;
-            txt = qtn_wlan_options_eap_plugin_enable;
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = ETtlsUiCmdDisable;
-            txt = qtn_wlan_options_eap_plugin_disable;
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = ETtlsUiCmdMoveUp;
-            txt = qtn_wlan_options_eap_plugin_priority_up;
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = ETtlsUiCmdMoveDown;
-            txt = qtn_wlan_options_eap_plugin_priority_down;
-            flags = EEikMenuItemSpecific;
-            },
-
-        MENU_ITEM 
-            { 
-            command = ETtlsUiCmdChange;
-            txt = qtn_options_change;
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp;
-            txt = qtn_options_help; 
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdExit;
-            txt = qtn_options_exit; 
-            }
-        };
-    }
-
-
-// Resource strings
-RESOURCE TBUF r_ttls_settings_title        { buf = qtn_wlan_eap_ttls_title; }
-RESOURCE TBUF r_ttls_username_inusestring      \
-                                  { buf = qtn_wlan_eap_sett_username_inuse; }
-RESOURCE TBUF r_ttls_username_inusestring_auto \
-                        { buf = qtn_wlan_eap_sett_username_inuse_from_cert; }
-RESOURCE TBUF r_ttls_username_inusestring_conf \
-                             { buf = qtn_wlan_eap_sett_username_inuse_user; }
-RESOURCE TBUF r_ttls_username_string    { buf = qtn_wlan_eap_sett_username; }
-RESOURCE TBUF r_ttls_realm_inusestring         \
-                                     { buf = qtn_wlan_eap_sett_realm_inuse; }
-RESOURCE TBUF r_ttls_realm_inusestring_auto    \
-                           { buf = qtn_wlan_eap_sett_realm_inuse_from_cert; }
-RESOURCE TBUF r_ttls_realm_inusestring_conf    \
-                                { buf = qtn_wlan_eap_sett_realm_inuse_user; }
-RESOURCE TBUF r_ttls_realm_string          { buf = qtn_wlan_eap_sett_realm; }
-RESOURCE TBUF r_ttls_user_cert_string          \
-                                { buf = qtn_wlan_eap_sett_user_certificate; }
-RESOURCE TBUF r_ttls_ca_cert_string            \
-                                  { buf = qtn_wlan_eap_sett_ca_certificate; }
-RESOURCE TBUF r_ttls_not_defined     { buf = qtn_wlan_eap_cert_not_defined; }
-RESOURCE TBUF r_ttls_none_selection            \
-                                  { buf = qtn_wlan_eap_cert_none_selection; }
-RESOURCE TBUF r_ttls_suite_rsarc4md5 { buf = qtn_wlan_eap_cipher_rsarc4md5; }
-RESOURCE TBUF r_ttls_suite_rsarc4sha { buf = qtn_wlan_eap_cipher_rsarc4sha; }
-RESOURCE TBUF r_ttls_suite_rsa3dessha          \
-                                    { buf = qtn_wlan_eap_cipher_rsa3dessha; }
-RESOURCE TBUF r_ttls_suite_dhersa3dessha       \
-                                 { buf = qtn_wlan_eap_cipher_dhersa3dessha; }
-RESOURCE TBUF r_ttls_suite_dhedss3dessha       \
-                                 { buf = qtn_wlan_eap_cipher_dhedss3dessha; }
-RESOURCE TBUF r_ttls_suite_rsaaessha { buf = qtn_wlan_eap_cipher_rsaaessha; }
-RESOURCE TBUF r_ttls_suite_dhersaaessha        \
-                                  { buf = qtn_wlan_eap_cipher_dhersaaessha; }
-RESOURCE TBUF r_ttls_suite_dhedssaessha        \
-                                  { buf = qtn_wlan_eap_cipher_dhedssaessha; }
-RESOURCE TBUF r_ttls_info_cannot_disable_all_eap_plugins \
-                      { buf = qtn_wlan_info_cannot_disable_all_eap_plugins; }
-RESOURCE TBUF r_ttls_info_plain_mschap_cannot_enable_along \
-                { buf = qtn_wlan_eap_info_plain_mschap_cannot_enable_along; }
-RESOURCE TBUF r_ttls_tls_privacy_string
-                                  { buf = qtn_wlan_eap_sett_tls_privacy; }
-RESOURCE TBUF r_ttls_info_pap_cannot_enable_along \
-                { buf = qtn_wlan_eap_info_pap_cannot_enable_along; }
-
-// ********************************************
-// USERNAME IN USE AND REALM POPUP DEFINITION
-// ********************************************
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_ttls_username_autouseconf_texts
-    {
-    setting_texts_resource = r_ttls_username_autouseconf_texts_resource;
-    popped_up_texts_resource = r_ttls_username_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_ttls_username_autouseconf_texts_resource
-    {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_username_inuse_from_cert; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_username_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_ttls_username_automatic_useconfigured_array
-    {
-    items =
-        {
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_from_cert; },
-        LBUF { txt = qtn_wlan_eap_sett_username_inuse_user; }
-        };
-    }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_ttls_realm_autouseconf_texts
-    {
-    setting_texts_resource = r_ttls_realm_autouseconf_texts_resource;
-    popped_up_texts_resource = r_ttls_realm_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_ttls_realm_autouseconf_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_realm_inuse_from_cert; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_realm_inuse_user; 
-            }
-        };
-    }
-
-
-RESOURCE ARRAY r_ttls_realm_automatic_useconfigured_array
-    {
-    items=
-        {
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_from_cert; },
-        LBUF { txt = qtn_wlan_eap_sett_realm_inuse_user; }
-        };
-    }
-
-
-RESOURCE ARRAY r_ttls_tls_privacy_autouseconf_texts_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_sett_tls_privacy_off; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_sett_tls_privacy_on; 
-            }
-        };
-    }
-
-
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_ttls_tls_privacy_autouseconf_texts
-    {
-    setting_texts_resource = r_ttls_tls_privacy_autouseconf_texts_resource;
-    popped_up_texts_resource = r_ttls_tls_privacy_automatic_useconfigured_array;
-    }
-
-
-RESOURCE ARRAY r_ttls_tls_privacy_automatic_useconfigured_array
-    {
-    items =
-        {
-        LBUF { txt = qtn_wlan_eap_sett_tls_privacy_off; },
-        LBUF { txt = qtn_wlan_eap_sett_tls_privacy_on; }
-        };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_ttls_display_autouseconf_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_realm_inuse;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_ttls_setting_enumerated_popup;
-    }
-
-
-RESOURCE POPUP_SETTING_LIST r_ttls_setting_enumerated_popup
-    {
-    flags = EAknPopupSettingListFlagInitialised;
-    }
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/inc/EapTtlsUi.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP TTLS UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _EAPTTLSUI_HRH_
-#define _EAPTTLSUI_HRH_
-
-enum TEapTtlsUiMenuCommands
-    {
-    ETtlsUiCmdUndefined = 6000,
-    ETtlsUiCmdChange,
-    ETtlsUiCmdEnable,
-    ETtlsUiCmdDisable,
-    ETtlsUiCmdConfigure,
-	ETtlsUiCmdMoveUp,
-    ETtlsUiCmdMoveDown,
-	ETtlsUiCmdViewDetails
-    };
-
-enum TEapTtlsUiNotes
-    {
-    TEapTtlsUiGeneralError = 6100
-    };
-
-enum TEapTtlsUiLines
-	{
-	ETtlsSettingsListBox = 6200
-	};
-
-enum TEapTtlsUiSettingIds
-	{
-	ETtlsSettingUserCert=6300,
-	ETtlsSettingCaCert,
-	ETtlsSettingUsernameInUseId,
-	ETtlsSettingUsernameId,
-	ETtlsSettingRealmInUseId,
-	ETtlsSettingRealmId,
-	ETtlsSettingTlsPrivacyId
-	};
-
-enum TEapTtlsUiSettingPageIds
-	{
-	ETtlsSettingPageUserCertificates=6400,
-	ETtlsSettingPageCaCertificates,
-	ETtlsSettingPageCipherSuites,
-	ETtlsSettingPageEapTypes,
-	ETtlsSettingPageSettings
-	};
-
-enum TEapTtlsUiListBoxes
-	{
-	ETtlsSettingsUserCertListbox=6500,
-	ETtlsSettingsCaCertListbox,
-	ETtlsSettingsCipherSuiteListbox,
-	ETtlsSettingsEapTypeListbox,
-	ETtlsSettingsListbox
-	};
-
-enum TEapTtlsSettingItems
-	{
-	ETtlsTabSheetSettingsUsernameInUse=6600,
-	ETtlsTabSheetSettingsUsername,
-	ETtlsTabSheetSettingsRealmInUse,
-	ETtlsTabSheetSettingsRealm
-	};
-
-// Constants that are used as page ids
-// TEapTtlsUiSettingPageIds does not work for this purpose
-#define KEAPTTLSSETTINGSPAGE 1
-#define KEAPTTLSEAPPAGE      2
-#define KEAPTTLSCIPHERPAGE   3
-
-#endif  //_EAPTTLSUI_HRH_
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/inc/EapTtlsUiSettingArray.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP TTLS UI settings array
-*
-*/
-
-/*
-* %version: 11 %
-*/
-
-#ifndef _EAPTTLSUISETTINGARRAY_H_
-#define _EAPTTLSUISETTINGARRAY_H_
-
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-#include "EapTtlsUi.hrh"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CEapTtlsSettingItemArray : public CBase
-    {
-    public:
-        static CEapTtlsSettingItemArray* NewL();
-        virtual ~CEapTtlsSettingItemArray();
-        CAknSettingItem* Item( TEapTtlsUiSettingPageIds aItem );
-        CAknSettingItemArray* Array();
-        void StoreSettingsL();
-
-        void AddTextItemL( TDes& aBuffer, TInt aId, TInt aTitleResource,
-                           TInt aSettingPageResource, TInt aAssociatedResource,
-                           TInt aOrdinal);
-
-        void AddBinarySettingItemL( TInt aSettingPageResourceId, 
-                                    TInt aTitleResourceId,
-                                    TInt aAssociatedResourceId,
-                                    TInt aOrdinal,
-                                    TBool& aModifiedValue);
-
-    protected:
-        CEapTtlsSettingItemArray();
-        void ConstructL();
-
-    private:
-        CAknSettingItemArray* iArray;
-    };
-
-#endif  // _EAPTTLSUISETTINGARRAY_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/inc/EapTtlsUiView.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of EAP TTLS UI setting dialog
-*
-*/
-
-/*
-* %version: 22 %
-*/
-
-#ifndef _EAPTTLSUIVIEW_H_
-#define _EAPTTLSUIVIEW_H_
-
-// INCLUDES
-#include <AknDialog.h>
-#include <EapTlsPeapUiConnection.h>
-#include <EapTlsPeapUiDataConnection.h>
-#include <EapTlsPeapUiTlsPeapData.h>
-#include <eikspane.h>
-#include <akntitle.h>
-#include <aknsettingitemlist.h>
-#include <aknlists.h>
-#include <aknselectionlist.h>
-#include <eiklbo.h>
-#include "EapTtlsUi.hrh"
-#include <EapTlsPeapUiCipherSuite.h>
-#include <EapTlsPeapUiEapType.h>
-#include <EapTlsPeapUiCertificate.h>
-#include <AbsEapTlsPeapUiCertificates.h>
-
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CSettingsListBoxItemDrawer;
-class CEapTtlsSettingItemArray;
-
-
-// CLASS DECLARATION
-
-/**
-*  Settings dialog class definition
-*/
-class CEapTtlsUiDialog : public CAknDialog, 
-                         public MEapTlsPeapUiCertificates,
-                         public MEikListBoxObserver
-    {
-    public:
-        CEapTtlsUiDialog( CEapTlsPeapUiConnection* aConnection, 
-                          TIndexType aIndexType, TInt aIndex, 
-                          TInt& aButtonId );
-
-        ~CEapTtlsUiDialog();
-
-        /**
-        * Create and launch dialog.
-        * @param aResourceId The resource ID of the dialog to load.
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( TInt aResourceId );
-        
-        /**
-        * Chain into key event handler.
-        * @param aKeyEvent The event.
-        * @param aType The type of key event.
-        * @return Was the key consumed or not.
-        */
-        TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,
-                                          TEventCode aType);
-
-    public: // From MEikListBoxObserver
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
-    
-    public: // From CEikDialog
-        
-        /**
-        * @see CEikDialog
-        */
-        void HandleDialogPageEventL( TInt aEventID );
-
-
-    protected:
-        void PreLayoutDynInitL();
-        void PostLayoutDynInitL();
-        TBool OkToExitL( TInt aButtonId );
-        void ProcessCommandL( TInt aCommand );
-        void PageChangedL( TInt aPageId );
-
-    private:
-        void ChangeTitleL( TBool aIsStarted );
-        void DrawSettingsListL();
-        void ShowSettingPageL( TInt aCalledFromMenu ); 
-        void MoveEapTypeL( TInt aOldPos, TInt aNewPos );
-        void DrawEapListL( TInt aWantedIndex );
-        TInt ShowRadioButtonSettingPageL( TInt aTitle, 
-                                          CDesCArrayFlat* aValues, 
-                                          TInt aCurrentItem );
-        void DrawCipherSuitesL();
-        void CompleteReadCertificates( const TInt aResult);
-        void CompleteUiConstructionL();
-        TInt CheckActiveUserCertificate();
-        TInt CheckActiveCaCertificate();
-        void UserCertificateHouseKeeping( TInt aSelected );
-        void CaCertificateHouseKeeping( TInt aSelected );
-        void CreateEapTypeDataBaseL();    
-        void SetCipherIconsL();
-        void SetEapIconsL();
-        TUint GetEnabledEapTypeCount();
-        TBool IsPlainMschapv2Enabled();
-        TBool IsPapEnabled();
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-        void GetFullCertLabelL( const SCertEntry& aCert, TDes& aFullLabel );
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-        
-        void ConfigureL( TBool aQuick );
-
-
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-        CEapTlsPeapUiDataConnection* iDataConnection;
-        CEapTlsPeapUiCipherSuites* iCipherSuites;
-        CEapTlsPeapUiCertificates* iCertificates;
-        
-        CEapTlsPeapUiTlsPeapData* iUiData;
-        CArrayFixFlat<TEapTlsPeapUiCipherSuite>* iUiCipherSuites;
-        CArrayFixFlat<TEapTlsPeapUiCertificate>* iUiUserCertificates;
-        CArrayFixFlat<TEapTlsPeapUiCertificate>* iUiCACertificates;
-        CArrayFixFlat<TEapTlsPeapUiEapType>* iUiEapTypes;
-                                
-        CAknSingleNumberStyleListBox* iUserCertificateListBox;
-        CAknSingleNumberStyleListBox* iCaCertificateListBox;
-        CAknSingleNumberStyleListBox* iCipherSuiteListBox;
-        CAknSingleNumberStyleListBox* iEapTypesListBox;
-        CEapTtlsSettingItemArray* iSettingArray;
-        CAknSettingStyleListBox* iSettingListBox;
-        CDesCArray* iEapTypeViewArray;
-        CDesCArray* iCipherSuitesViewArray;
-        CEapTlsPeapUiEapTypes* iEapTypes;
-        TIndexType iIndexType; 
-        TInt iIndex;
-        HBufC* iPreviousText;
-        TInt* iButtonId;
-        
-        // Tells the status of UI construction. TRUE if UI construction is completed.
-		TBool iIsUIConstructionCompleted;
-		
-		// For exiting dialog
-		TBool iExiting;
-    };
-
-
-#endif // _EAPTTLSUIVIEW_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/loc/eapttlsui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN EAP-TTLS authentication settings
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:UI title for main view
-//l:title_pane_t2/opt9
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_ttls_title     "EAP-TTLS settings"
-
-
-//d:Popup note to signal mschapv2 can only be enabled alone
-//l:popup_note_window
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_info_plain_mschap_cannot_enable_along   "Plain MSCHAPv2 cannot be enabled along with other EAP plug-ins"
-
-//d:Popup note to signal that PAP can only be enabled alone
-//l:popup_note_window
-//w:
-//r:5.1
-//
-#define qtn_wlan_eap_info_pap_cannot_enable_along   "PAP cannot be enabled along with other EAP plug-ins"
-
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUi.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP TTLS UI class
-*
-*/
-
-/*
-* %version: 15 %
-*/
-
-// INCLUDE FILES
-#include "EapTtlsUi.h"
-#include "EapTtlsUiView.h"
-#include <eapttlsui.rsg>
-#include <bautils.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "eapttlsui.rsc" );
-
-
-// CLASS DECLARATION
-class TResourceFileCleanupItem
-    {
-    public:
-        CCoeEnv* iCoeEnv;
-        TInt iResourceFileOffset;
-    }; 
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupResourceFile
-// -----------------------------------------------------------------------------
-//
-static void CleanupResourceFile( TAny* aObject )
-    {
-    TResourceFileCleanupItem* item = 
-                        REINTERPRET_CAST( TResourceFileCleanupItem*, aObject );
-    item->iCoeEnv->DeleteResourceFile( item->iResourceFileOffset );
-    delete item;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUi::CEapTtlsUi
-// -----------------------------------------------------------------------------
-//
-CEapTtlsUi::CEapTtlsUi( CEapTlsPeapUiConnection* aConnection, 
-                        TIndexType aIndexType, 
-                        TInt aIndex ) 
-: iConnection( aConnection ), 
-  iIndexType( aIndexType ), 
-  iIndex( aIndex )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUi::NewL
-// -----------------------------------------------------------------------------
-//
-CEapTtlsUi* CEapTtlsUi::NewL( CEapTlsPeapUiConnection* aConnection, 
-                              TIndexType aIndexType, 
-                              TInt aIndex ) 
-    {
-    CEapTtlsUi* self = new( ELeave ) CEapTtlsUi( aConnection, aIndexType, 
-                                                 aIndex );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );    
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUi::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUi::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUi::~CEapTtlsUi
-// -----------------------------------------------------------------------------
-//
-CEapTtlsUi::~CEapTtlsUi()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUi::InvokeUiL
-// -----------------------------------------------------------------------------
-//
-TInt CEapTtlsUi::InvokeUiL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    CCoeEnv* coeEnv = CCoeEnv::Static();
-    BaflUtils::NearestLanguageFile( coeEnv->FsSession(), fileName );
-
-    TResourceFileCleanupItem* item = new( ELeave ) TResourceFileCleanupItem;
-
-    item->iCoeEnv = coeEnv;
-    CleanupStack::PushL( TCleanupItem( CleanupResourceFile, item ) );
-    item->iResourceFileOffset = coeEnv->AddResourceFileL( fileName );
-
-    TInt buttonId;
-    CEapTtlsUiDialog* settingsDlg = new( ELeave ) CEapTtlsUiDialog( 
-                                iConnection, iIndexType, iIndex, buttonId );
-    settingsDlg->ConstructAndRunLD( R_TTLS_SETTING_DIALOG );
-
-    CleanupStack::PopAndDestroy();  // For resource file
-    
-    return buttonId;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUiSettingArray.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP TTLS UI settings array
-*
-*/
-
-/*
-* %version: 13 %
-*/
-
-// INCLUDE FILES
-#include "EapTtlsUiSettingArray.h"
-#include "EapTtlsUi.hrh"
-#include <aknsettingitemlist.h>
-#include <akntextsettingpage.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::CEapTtlsSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapTtlsSettingItemArray::CEapTtlsSettingItemArray()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::NewL
-// -----------------------------------------------------------------------------
-//
-CEapTtlsSettingItemArray* CEapTtlsSettingItemArray::NewL() 
-    {
-    CEapTtlsSettingItemArray* self = new( ELeave ) CEapTtlsSettingItemArray();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); // self
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsSettingItemArray::ConstructL() 
-    {
-    iArray = new( ELeave ) CAknSettingItemArray( 2, EFalse, 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::~CEapTtlsSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CEapTtlsSettingItemArray::~CEapTtlsSettingItemArray()
-    {
-    if( iArray ) 
-        {
-        // ResetAndDestroy()
-        iArray->ResetAndDestroy();
-        }    
-    delete iArray;   
-    iArray = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::Item
-// -----------------------------------------------------------------------------
-//
-CAknSettingItem* CEapTtlsSettingItemArray::Item( TEapTtlsUiSettingPageIds aId )
-    {
-    for( TInt i = 0; i < iArray->Count(); i++ )
-        {
-        if( iArray->At( i )->Identifier() == aId )
-            {
-            return iArray->At( i );
-            }
-        }
-
-    __ASSERT_DEBUG( EFalse, User::Invariant() );
-    return NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::Array
-// -----------------------------------------------------------------------------
-//
-CAknSettingItemArray* CEapTtlsSettingItemArray::Array() 
-    {
-    return iArray;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::StoreSettingsL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsSettingItemArray::StoreSettingsL()
-    {
-    // Do what SettingItemList::StoreSettings would do. 
-    for( TInt i( 0 ); i < iArray->Count(); ++i ) 
-        {
-        iArray->At( i )->StoreL();
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::AddTextItemL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsSettingItemArray::AddTextItemL( TDes& aBuffer, 
-                                             TInt aId, 
-                                             TInt aTitleResource, 
-                                             TInt aSettingPageResource,
-                                             TInt aAssociatedResource, 
-                                             TInt aOrdinal )
-    {
-    // Create new setting item
-    CAknTextSettingItem* settingItem = new ( ELeave ) CAknTextSettingItem( aId,
-                                                                    aBuffer );
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KNullDesC );
-    settingItem->SetSettingPageFlags( 
-                                    CAknTextSettingPage::EZeroLengthAllowed );
-
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResource );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList,
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    
-    CleanupStack::PopAndDestroy( itemTitle );
-
-    // Items are destroyed in destructor when resetting array
-    CleanupStack::Pop( settingItem ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsSettingItemArray::AddBinarySettingItemL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsSettingItemArray::AddBinarySettingItemL( 
-                                                 TInt aSettingPageResourceId,
-                                                 TInt aTitleResourceId, 
-                                                 TInt aAssociatedResourceId,
-                                                 TInt aOrdinal, 
-                                                 TBool& aModifiedValue )
-    {
-    CAknSettingItem* settingItem = new( ELeave ) 
-    CAknBinaryPopupSettingItem( 0, aModifiedValue );
-    CleanupStack::PushL( settingItem );
-
-    HBufC* itemTitle = CEikonEnv::Static()->AllocReadResourceLC( 
-                                                            aTitleResourceId );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResourceId, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResourceId );
-    iArray->AppendL( settingItem );
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/EapTtls/ConfigUi/src/EapTtlsUiView.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1882 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of EAP TTLS UI settings dialog
-*
-*/
-
-/*
-* %version: 27.1.1.1.10 %
-*/
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include "EapTtlsUiView.h"
-#include "EapTtlsUi.hrh"
-#include <eapttlsui.rsg>
-#include <akntextsettingpage.h>
-#include <aknsettingitemlist.h>
-#include "EapTtlsUiSettingArray.h"
-#include <aknnavi.h>
-#include <akntabgrp.h>
-#include <aknnavide.h>
-#include <aknradiobuttonsettingpage.h>
-#include <StringLoader.h>
-#include <aknnotewrappers.h>
-#include <EapTlsPeapUiCipherSuites.h>
-#include <EapTlsPeapUiEapTypes.h>
-#include <EapTlsPeapUiCertificates.h>
-#include <EapType.h>
-#include <EapTypeInfo.h> 
-#include <AknIconArray.h>
-#include <AknsUtils.h>
-
-#include <featmgr.h>
-#include <hlplch.h>
-
-
-// CONSTANTS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
-
-static const TInt KSettingArrayGranularity = 4;    
-static const TInt KSuiteArrayGranularity = 5;
-static const TInt KMaxLengthOfEapLine = 270;
-static const TInt KCertificateArrayGranularity = 5;
-static const TInt KMaxLengthOfSuiteName = 255;
-static const TInt KEapTtlsId = 21;
-
-_LIT( KNameSeparator, " " );
-_LIT( KEmptyString, "" );
-const TUint KFirstElement = 0;
-const TUint KSecondElement = 1;
-const TUint KMinEnabledCount = 1;
-
-/* This is the maximum length of a certificate's full name, includes
-label, primary and secondary names */
-const TUint32 KMaxFullCertLabelLength = KMaxCertLabelLength + 2 * 
-                                    KMaxNameLength + 1; // 1 is for separator.
-
-// MODULE DATA STRUCTURES
-enum TPageIds
-    {
-    ESettingsPage = 0,
-    EEapTypePage,
-    ECipherSuitePage
-    };
-
-enum TSettingIds
-    {
-    EUserCertificateItem = 0,
-    ECaCertificateItem,
-    EUsernameInUseItem,
-    EUsernameItem,
-    ERealmInUseItem,
-    ERealmItem
-    };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::CEapTtlsUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapTtlsUiDialog::CEapTtlsUiDialog( CEapTlsPeapUiConnection* aConnection,
-                                    TIndexType aIndexType, TInt aIndex, 
-								    TInt& aButtonId ) 
-: CAknDialog(), 
-  iConnection( aConnection ),
-  iIndexType( aIndexType ), 
-  iIndex( aIndex ), 
-  iButtonId( &aButtonId ),
-  iIsUIConstructionCompleted( EFalse ),
-  iExiting( EFalse )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CEapTtlsUiDialog::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CEapTtlsUiDialog::ConstructAndRunLD( TInt aResourceId )
-    {
-    CleanupStack::PushL( this );
-
-    iSettingArray = CEapTtlsSettingItemArray::NewL();
-
-    User::LeaveIfError( iConnection->Connect() );
-
-    // Basic data
-    iDataConnection = iConnection->GetDataConnection();
-    if ( iDataConnection == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iDataConnection->Open() );
-    User::LeaveIfError( iDataConnection->GetData( &iUiData ) );
-    
-    // Cipher suites
-    iCipherSuites = iConnection->GetCipherSuiteConnection();
-    if ( iCipherSuites == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-
-    User::LeaveIfError( iCipherSuites->Open() );
-    User::LeaveIfError( iCipherSuites->GetCipherSuites( &iUiCipherSuites ) );
-
-    iCipherSuitesViewArray = new( ELeave ) CDesCArrayFlat( 
-                                                    KSuiteArrayGranularity );
-    //EAP types 
-    iEapTypes = iConnection->GetEapTypeConnection();
-    if ( iEapTypes == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iEapTypes->Open() );
-    User::LeaveIfError( iEapTypes->GetEapTypes( &iUiEapTypes ) );
-    if ( iUiEapTypes->Count() == 0 )
-        {
-        CreateEapTypeDataBaseL();
-        }
-
-    iEapTypeViewArray = new( ELeave ) CDesCArrayFlat( 
-                                                    KSettingArrayGranularity );
-
-    FeatureManager::InitializeLibL();
-
-    ConstructL( R_TTLS_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-    
-    return CAknDialog::ExecuteLD( aResourceId );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CEapTtlsUiDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                     TEventCode aType )
-    {
-    TKeyResponse result( EKeyWasNotConsumed );
-    
-    // gently handle impatient users
-	if ( !iIsUIConstructionCompleted )
-        {
-        return CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-        }
-    
-    TInt pageId = ActivePageId();
-    if ( aType == EEventKey && pageId == KEAPTTLSCIPHERPAGE )
-        {
-        TInt indexBefore = iCipherSuiteListBox->CurrentItemIndex();
-        
-        if ( aKeyEvent.iCode == EKeyEnter )
-            {
-            if ( ( *iUiCipherSuites )[indexBefore].iIsEnabled )
-                {
-                OkToExitL( ETtlsUiCmdDisable );
-                }
-            else
-                {
-                OkToExitL( ETtlsUiCmdEnable );
-                }
-                
-            result = EKeyWasConsumed;
-            }
-        else
-            {        
-            result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-            }
-            
-        TInt indexAfter = iCipherSuiteListBox->CurrentItemIndex();
-
-        if ( indexBefore != indexAfter )
-            {
-            CEikButtonGroupContainer& cba = ButtonGroupContainer();
-            if( ( *iUiCipherSuites )[ indexAfter ].iIsEnabled )
-                {
-                cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-                }
-            else
-                {
-                cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                }
-            
-            cba.DrawDeferred();
-            }
-        }
-    else if ( aType == EEventKey && pageId == KEAPTTLSEAPPAGE )
-        {
-        TInt indexBefore = iEapTypesListBox->CurrentItemIndex();
-        
-        if ( aKeyEvent.iCode == EKeyEnter )
-            {
-            if ( ( *iUiEapTypes )[indexBefore].iIsEnabled )
-                {
-                OkToExitL( ETtlsUiCmdConfigure );
-                }
-            else
-                {
-                OkToExitL( ETtlsUiCmdEnable );
-                }
-                
-            result = EKeyWasConsumed;
-            }
-        else
-            {        
-            result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-            }
-            
-        TInt indexAfter = iEapTypesListBox->CurrentItemIndex();
-
-        if ( indexBefore != indexAfter )
-            {
-            CEikButtonGroupContainer& cba = ButtonGroupContainer();
-            if( ( *iUiEapTypes )[indexAfter].iIsEnabled )
-                {
-                cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_CONFIGURE );
-                }
-            else
-                {
-                cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                }
-            
-            cba.DrawDeferred();
-            }        
-        }
-    else
-        {
-        result = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-        }
-
-    return result;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::~CEapTtlsUiDialog
-// -----------------------------------------------------------------------------
-//
-CEapTtlsUiDialog::~CEapTtlsUiDialog()
-    {
-     if ( iSettingArray )
-        {
-        iSettingArray->Array()->ResetAndDestroy();
-        }
-
-    delete iSettingArray;
-
-    iSettingListBox = NULL;
-    
-    iDataConnection->Close();
-    delete iDataConnection;
-
-    iCipherSuitesViewArray->Reset();
-    delete iCipherSuitesViewArray;    
-
-    iEapTypeViewArray->Reset();
-    delete iEapTypeViewArray;
-
-	iCertificates->Close();
-	delete iCertificates;
-
-	iCipherSuites->Close();
-	delete iCipherSuites;
-
-	iEapTypes->Close();
-	delete iEapTypes;
-
-	iConnection->Close();
-    
-    delete iPreviousText;
-    
-    FeatureManager::UnInitializeLib();
-    }
-    
-    
-// ---------------------------------------------------------
-// CEapTtlsUiDialog::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CEapTtlsUiDialog::HandleListBoxEventL( CEikListBox* aListBox,
-                                            TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            if ( aListBox == iSettingListBox )
-                {
-                OkToExitL( ETtlsUiCmdChange );                    
-                }
-                
-            else if ( aListBox == iEapTypesListBox )
-                {
-                TInt index = iEapTypesListBox->CurrentItemIndex();
-                if ( iUiEapTypes->At( index ).iIsEnabled )
-                    {
-                    ConfigureL(ETrue);   
-                    }
-                else
-                    {
-                    OkToExitL( ETtlsUiCmdEnable );
-                    }                    
-                }
-                                     
-            else if ( aListBox == iCipherSuiteListBox )
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                if ( iUiCipherSuites->At( index ).iIsEnabled )
-                    {
-                    OkToExitL( ETtlsUiCmdDisable );
-                    }
-                else
-                    {
-                    OkToExitL( ETtlsUiCmdEnable );
-                    }
-                }
-                
-            else
-                {
-                // Do nothing; we should never end up here
-                }
-                        
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }   
-
-
-// ---------------------------------------------------------
-// CEapTtlsUiDialog::HandleDialogPageEventL
-// ---------------------------------------------------------
-//
-void CEapTtlsUiDialog::HandleDialogPageEventL( TInt aEventID )
-    {
-     CAknDialog::HandleDialogPageEventL( aEventID );
-         if( iExiting )
-             {        
-             // Exit requested. 
-             TryExitL( EAknCmdExit );
-             }   
-     }
-
-
-// ---------------------------------------------------------
-// CEapTtlsUiDialog::ConfigureL
-// ---------------------------------------------------------
-//
-void CEapTtlsUiDialog::ConfigureL( TBool aQuick )
-    {
-    RImplInfoPtrArray eapArray;
-    eapArray.Reset();
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid,
-            eapArray );
-    TInt itemIndex = iEapTypesListBox->CurrentItemIndex(); 
-    TInt eapIndex( 0 );
-    for ( TInt i = 0; i < eapArray.Count(); ++i )
-        {
-        CImplementationInformation* tempInfo = eapArray[i];
-        if ( iUiEapTypes->At( itemIndex ).iEapType == 
-        tempInfo->DataType() )
-            {
-            eapIndex = i;
-            break;            
-            }
-        }   
-
-    CEapType* eapType;
-    eapType = CEapType::NewL( eapArray[eapIndex]->DataType(), 
-            iIndexType, iIndex );
-    eapArray.ResetAndDestroy();
-    eapType->SetTunnelingType( KEapTtlsId );
-    CleanupStack::PushL( eapType );
-    TInt buttonId = eapType->InvokeUiL();
-    CleanupStack::PopAndDestroy( eapType );
-    if ( buttonId == EAknCmdExit || buttonId == EEikCmdExit )
-        {
-        if (aQuick == EFalse)
-            {
-            TryExitL( buttonId );
-            }
-        else
-            {
-            iExiting = ETrue;
-            // Don't exit here. Framework command chain will
-            // cause a KERN-EXEC 3 panic. Handle the exit in 
-            // HandleDialogPageEventL(). 
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::PreLayoutDynInitL()
-    {
-    // Change title
-    ChangeTitleL( ETrue );
-    
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                              ControlOrNull( ETtlsSettingsListbox ) );
-    iSettingListBox->SetComponentsToInheritVisibility( ETrue );
-    
-    iEapTypesListBox = static_cast<CAknSingleNumberStyleListBox*>(
-                              ControlOrNull( ETtlsSettingsEapTypeListbox ) );
-    iEapTypesListBox->SetComponentsToInheritVisibility( ETrue );
-
-    iCipherSuiteListBox = static_cast<CAknSingleNumberStyleListBox*>(
-                               ControlOrNull( ETtlsSettingsCipherSuiteListbox ) );
-    iCipherSuiteListBox->SetComponentsToInheritVisibility( ETrue );
-    
-    // Get certificates before building the UI. 
-    // Will continue when certificates are received
-    iCertificates = iConnection->GetCertificateConnection( this );
-    User::LeaveIfError( iCertificates->Open() );
-    iCertificates->GetCertificates( &iUiUserCertificates, &iUiCACertificates );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::CompleteReadCertificates
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::CompleteReadCertificates( const TInt aResult )
-    {
-    if ( aResult == KErrNone ) // Certifiocates are received from core
-        {
-        TRAPD( err, CompleteUiConstructionL() );
-        if ( err != KErrNone )
-            {
-            TRAP_IGNORE( TryExitL( KErrCancel ) );        
-            }        
-        }
-    else
-        {
-        TRAP_IGNORE( TryExitL( KErrCancel ) );
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::CompleteUiConstructionL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::CompleteUiConstructionL()
-    {
-    // Initialize setting page 
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                    ControlOrNull( ETtlsSettingsListbox ) );
-    iSettingListBox->SetMopParent( this );
-    iSettingListBox->CreateScrollBarFrameL( ETrue );
-    iSettingListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iSettingListBox->SetListBoxObserver( this );                                                 
-    DrawSettingsListL();
-
-    // Initialize EAP types page
-    iEapTypesListBox = static_cast<CAknSingleNumberStyleListBox*>( 
-                                ControlOrNull( ETtlsSettingsEapTypeListbox ) );
-    iEapTypesListBox->SetMopParent( this );
-    iEapTypesListBox->CreateScrollBarFrameL( ETrue );
-    iEapTypesListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iEapTypesListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iEapTypesListBox->SetListBoxObserver( this );     
-    
-    // Following deletes internal array created from resources. 
-    // To prevent memory leak.
-    MDesCArray* internalArray1 = iEapTypesListBox->Model()->ItemTextArray();
-    delete internalArray1;
-
-    // Initialize cipher suites page
-    iCipherSuiteListBox = static_cast<CAknSingleNumberStyleListBox*>( 
-                            ControlOrNull( ETtlsSettingsCipherSuiteListbox ) );
-    iCipherSuiteListBox->CreateScrollBarFrameL( ETrue );
-    iCipherSuiteListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iCipherSuiteListBox->UpdateScrollBarsL();
-    iCipherSuiteListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iCipherSuiteListBox->SetListBoxObserver( this );   
-        
-    //Following deletes internal array created from resources. 
-    // To prevent memory leak.
-    MDesCArray* internalArray2 = iCipherSuiteListBox->Model()->ItemTextArray();
-    delete internalArray2;
-
-    SetEapIconsL();
-    DrawEapListL( 0 );
-
-    SetCipherIconsL();
-    DrawCipherSuitesL();
-    
-    iIsUIConstructionCompleted = ETrue;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::PostLayoutDynInitL()
-    {
-    TUid naviPaneUid;
-    naviPaneUid.iUid = EEikStatusPaneUidNavi;
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( naviPaneUid );
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        CAknNavigationControlContainer* naviPane = 
-                                static_cast<CAknNavigationControlContainer*>(
-                                        statusPane->ControlL( naviPaneUid ) );
-        CAknNavigationDecorator* naviDecorator = naviPane->ResourceDecorator();
-        if ( naviDecorator )
-            {
-            CAknTabGroup* tabGroup = static_cast<CAknTabGroup*>( 
-                                        naviDecorator->DecoratedControl() );
-            tabGroup->SetActiveTabById( 0 ); 
-            tabGroup->SetTabFixedWidthL( KTabWidthWithOneTab );
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::ChangeTitleL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::ChangeTitleL( TBool aIsStarted )
-    {
-    TUid titlePaneUid;
-    titlePaneUid.iUid = EEikStatusPaneUidTitle;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( titlePaneUid );
-    
-    if ( subPane.IsPresent()&&subPane.IsAppOwned() )
-        {
-        CAknTitlePane* titlePane = static_cast<CAknTitlePane*>( 
-                                        statusPane->ControlL( titlePaneUid ) );
-        if ( aIsStarted )
-            {
-            // Store previous application title text
-            const TDesC* prevText = titlePane->Text();    
-            iPreviousText = HBufC::NewL( prevText->Length() );
-            iPreviousText->Des().Append( *prevText );
-            TDesC* titleText = iEikonEnv->AllocReadResourceLC( 
-                                                    R_TTLS_SETTINGS_TITLE );
-            titlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText ); 
-            }
-        else
-            {
-            // Set calling application title text back
-            titlePane->SetTextL( *iPreviousText );    
-            }    
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CEapTtlsUiDialog::OkToExitL( TInt aButtonId )
-    {
-    TBool ret( EFalse );
-    switch ( aButtonId )
-        {
-        case EEikBidOk:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                TPageIds index = static_cast<TPageIds>( ActivePageIndex() );
-                if ( index == ESettingsPage )
-                    {
-                    ShowSettingPageL( EFalse );
-                    }    
-                else if ( index == EEapTypePage )
-                    {
-                    ProcessCommandL( ETtlsUiCmdConfigure );
-                    }
-                }
-            else
-                {
-                #if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CEapTtlsUiDialog::OkToExitL - UI not ready - Ignoring key press.\n") );
-				#endif
-                }
-            break;
-            }
-
-        case EAknSoftkeyOptions:
-            {
-            DisplayMenuL();
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-            {
-            if( ( GetEnabledEapTypeCount() > KMinEnabledCount ) &&
-                  ( IsPlainMschapv2Enabled() || IsPapEnabled() ) )
-                {
-                HBufC* stringLabel;
-
-                if ( IsPlainMschapv2Enabled() )
-                    {
-                    stringLabel = StringLoader::LoadL(
-                            R_TTLS_INFO_PLAIN_MSCHAP_CANNOT_ENABLE_ALONG,
-                                                   iEikonEnv );
-                    }
-                else
-                    {
-                    stringLabel = StringLoader::LoadL(
-                            R_TTLS_INFO_PAP_CANNOT_ENABLE_ALONG,
-                                                   iEikonEnv );
-                    }
-                CleanupStack::PushL( stringLabel );
-                CAknInformationNote* dialog = new ( ELeave )
-                                            CAknInformationNote( ETrue );
-                dialog->ExecuteLD( *stringLabel );
-                CleanupStack::PopAndDestroy( stringLabel );
-                
-                // after showing the info note, EAP settings page
-                // must be shown
-                if( ActivePageId() == KEAPTTLSSETTINGSPAGE )
-                    {
-                    TKeyEvent keyRight = 
-                        {
-                            EKeyRightArrow,
-                            EStdKeyRightArrow,
-                            EModifierPureKeycode,
-                            0
-                        };
-                    CAknDialog::OfferKeyEventL
-                                            ( keyRight,
-                                              EEventKey );
-                    }
-                if( ActivePageId() == KEAPTTLSCIPHERPAGE )
-                    {
-                    TKeyEvent keyLeft = 
-                        {
-                            EKeyLeftArrow,
-                            EStdKeyLeftArrow,
-                            EModifierPureKeycode,
-                            0
-                        };
-                    CAknDialog::OfferKeyEventL
-                                            ( keyLeft,
-                                              EEventKey );
-                    }
-
-                iExiting = EFalse;    
-                ret = EFalse;
-                }
-            else
-                {
-                if( iIsUIConstructionCompleted )
-                    {
-                    iDataConnection->Update();
-                    ChangeTitleL( EFalse );
-                    ret = ETrue;
-                    }
-                }
-            break;
-            }
-            
-        case ETtlsUiCmdChange:
-            {
-            TPageIds index = static_cast<TPageIds>( ActivePageIndex() );
-            if ( index == ESettingsPage )
-                {
-                if( iIsUIConstructionCompleted )
-    				{
-        			ShowSettingPageL( EFalse );
-    				}
-    			else
-    			    {
-    				#if defined(_DEBUG) || defined(DEBUG)
-    				RDebug::Print(_L("CEapPeapUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-    				#endif
-    			    }
-                }
-            break;
-            }
-            
-        case ETtlsUiCmdConfigure:
-        case ETtlsUiCmdEnable:
-        case ETtlsUiCmdDisable:
-            {
-            ProcessCommandL( aButtonId );
-            ret = EFalse;
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-
-    if ( ret )
-        {
-        *iButtonId = aButtonId;
-        }
-
-    return ret;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::DrawSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::DrawSettingsListL()
-    {  
-    iSettingArray->Array()->ResetAndDestroy();
-    TInt ordinal = 0;
-    TInt activeUserCertificate = CheckActiveUserCertificate();
-    TBuf<KMaxFullCertLabelLength> aActiveuserCertificateName = KEmptyString();
-    if ( activeUserCertificate != KErrNotFound )
-        {
-		TBuf<KMaxFullCertLabelLength> text;
-		GetFullCertLabelL( 
-                iUiUserCertificates->At( activeUserCertificate ).iCertEntry,
-                text );
-		aActiveuserCertificateName.Copy( text );		
-        }
-    else
-        {
-        TDesC* notDefinedText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_TTLS_NOT_DEFINED );
-        aActiveuserCertificateName.Copy( *notDefinedText );
-        CleanupStack::PopAndDestroy( notDefinedText );
-        }
-
-    iSettingArray->AddTextItemL( aActiveuserCertificateName,
-                                 ETtlsSettingUserCert,
-                                 R_TTLS_USER_CERT_STRING,
-                                 R_TTLS_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    TInt activeCaCertificate = CheckActiveCaCertificate();
-    TBuf<KMaxFullCertLabelLength> aActiveCaCertificateName = KEmptyString();
-    if ( activeCaCertificate != KErrNotFound )
-        {
-		TBuf<KMaxFullCertLabelLength> text;
-		GetFullCertLabelL(
-                    iUiCACertificates->At( activeCaCertificate ).iCertEntry,
-                    text );
-		aActiveCaCertificateName.Copy( text );				
-        }
-    else
-        {
-        TDesC* notDefinedText = iEikonEnv->AllocReadResourceLC( 
-                                                        R_TTLS_NOT_DEFINED );
-        aActiveCaCertificateName.Copy( *notDefinedText );
-        CleanupStack::PopAndDestroy( notDefinedText );                
-        }
-
-    iSettingArray->AddTextItemL( aActiveCaCertificateName,
-                                 ETtlsSettingCaCert,
-                                 R_TTLS_CA_CERT_STRING,
-                                 R_TTLS_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-      
-    iSettingArray->AddBinarySettingItemL( R_TTLS_DISPLAY_AUTOUSECONF_PAGE, 
-                                          R_TTLS_USERNAME_INUSESTRING, 
-                                          R_TTLS_USERNAME_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetUseManualUsername() );
-
-    iSettingArray->AddTextItemL( iUiData->GetManualUsername(),
-                                 ETtlsTabSheetSettingsUsername,
-                                 R_TTLS_USERNAME_STRING,
-                                 R_TTLS_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-
-    iSettingArray->AddBinarySettingItemL( R_TTLS_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_TTLS_REALM_INUSESTRING, 
-                                          R_TTLS_REALM_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetUseManualRealm() );    
-
-    iSettingArray->AddTextItemL( iUiData->GetManualRealm(),
-                                 ETtlsTabSheetSettingsRealm,
-                                 R_TTLS_REALM_STRING,
-                                 R_TTLS_REALM_PAGE,
-                                 NULL,
-                                 ordinal++ );
-    
-    iSettingArray->AddBinarySettingItemL( R_TTLS_DISPLAY_AUTOUSECONF_PAGE,
-                                          R_TTLS_TLS_PRIVACY_STRING, 
-                                          R_TTLS_TLS_PRIVACY_AUTOUSECONF_TEXTS,
-                                          ordinal++,
-                                          *iUiData->GetTlsPrivacy() );
-        
-    iSettingListBox->Model()->SetItemTextArray( iSettingArray->Array() );    
-    iSettingListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iSettingArray->Array()->RecalculateVisibleIndicesL();
-    iSettingListBox->HandleItemAdditionL();
-    iSettingListBox->UpdateScrollBarsL();  
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::DynInitMenuPaneL( TInt aResourceId, 
-                                         CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aMenuPane && aResourceId == R_TTLS_MENU_PANE )
-        {
-        if ( !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-
-        TPageIds index = static_cast<TPageIds>( ActivePageIndex() );
-        if ( index == ESettingsPage )
-            {
-            aMenuPane->SetItemDimmed( ETtlsUiCmdEnable,    ETrue );
-            aMenuPane->SetItemDimmed( ETtlsUiCmdDisable,   ETrue );
-            aMenuPane->SetItemDimmed( ETtlsUiCmdConfigure, ETrue );
-            aMenuPane->SetItemDimmed( ETtlsUiCmdMoveUp,    ETrue );
-            aMenuPane->SetItemDimmed( ETtlsUiCmdMoveDown,  ETrue );
-            }
-        else if ( index == EEapTypePage )
-            {
-            aMenuPane->SetItemDimmed( ETtlsUiCmdChange, ETrue );
-
-            if ( iEapTypeViewArray->Count() > 0 )
-                {
-                TInt currentIndex = iEapTypesListBox->CurrentItemIndex();
-                TBool enabled = iUiEapTypes->At( currentIndex ).iIsEnabled;
-                
-                // Hide either "Enable" or "Disable", as appropriate.
-                aMenuPane->SetItemDimmed( ETtlsUiCmdEnable,  enabled );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdDisable, !enabled );
-
-                // Don't display "Configure" for disabled items
-                aMenuPane->SetItemDimmed( ETtlsUiCmdConfigure, !enabled );
-
-                // Don't display "Raise priority" nor "Lower priority" for 
-                // disabled items
-                aMenuPane->SetItemDimmed( ETtlsUiCmdMoveUp, !enabled );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdMoveDown, !enabled );
-
-                if ( enabled )
-                    {
-                    if ( currentIndex == 0 )
-                        {
-                        // Can't go higher than top.
-                        aMenuPane->SetItemDimmed( ETtlsUiCmdMoveUp, ETrue );
-                        }
-                    else if ( currentIndex == iEapTypeViewArray->Count()-1 ||
-                         ( currentIndex < iEapTypeViewArray->Count()-1 && 
-                         !iUiEapTypes->At( currentIndex + 1 ).iIsEnabled ) ) 
-                        {
-                        // Can't go lower than the last enabled item
-                        aMenuPane->SetItemDimmed( ETtlsUiCmdMoveDown, ETrue );
-                        }
-                    }
-
-                }
-            else
-                {
-                aMenuPane->SetItemDimmed( ETtlsUiCmdEnable,    ETrue );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdDisable,   ETrue );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdConfigure, ETrue );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdMoveUp,    ETrue );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdMoveDown,  ETrue );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdChange,    ETrue );
-                }
-            }
-        else if ( index == ECipherSuitePage )
-            {
-            aMenuPane->SetItemDimmed( ETtlsUiCmdConfigure, ETrue );
-            aMenuPane->SetItemDimmed( ETtlsUiCmdMoveUp,    ETrue );
-            aMenuPane->SetItemDimmed( ETtlsUiCmdMoveDown,  ETrue );
-            aMenuPane->SetItemDimmed( ETtlsUiCmdChange,    ETrue );
-
-            if ( iCipherSuitesViewArray->Count() > 0 )
-                {
-                TInt currIndex = iCipherSuiteListBox->CurrentItemIndex();
-                TBool enabled = iUiCipherSuites->At( currIndex ).iIsEnabled;
-
-                // Hide either "Enable" or "Disable", as appropriate.
-                aMenuPane->SetItemDimmed( ETtlsUiCmdEnable,  enabled );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdDisable, !enabled );
-                }
-            else
-                {
-                aMenuPane->SetItemDimmed( ETtlsUiCmdEnable,  ETrue );
-                aMenuPane->SetItemDimmed( ETtlsUiCmdDisable, ETrue );
-                }
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::ProcessCommandL( TInt aCommand )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    TPageIds pageIndex = static_cast<TPageIds>( ActivePageIndex() );
-    switch( aCommand )
-        {
-        case EAknCmdExit:
-            {
-            TryExitL( aCommand );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case ETtlsUiCmdChange:
-            {
-            if ( pageIndex == ESettingsPage )
-                {
-                if( iIsUIConstructionCompleted )
-    				{
-        			ShowSettingPageL( ETrue );
-    				}
-    			else
-    			    {
-    				#if defined(_DEBUG) || defined(DEBUG)
-    				RDebug::Print(_L("CEapTtlsUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-    				#endif						
-    			    }
-                }    
-            break;
-            }
-
-        case ETtlsUiCmdMoveUp:
-            {
-            if ( pageIndex == EEapTypePage )
-                {
-                TInt cur = iEapTypesListBox->CurrentItemIndex();
-                MoveEapTypeL( cur, cur - 1 );
-                }
-            break;
-            }
-
-        case ETtlsUiCmdMoveDown:
-            {
-            if ( pageIndex == EEapTypePage )
-                {
-                TInt cur = iEapTypesListBox->CurrentItemIndex();
-                MoveEapTypeL( cur, cur + 1 );
-                }
-            break;
-            }
-
-        case ETtlsUiCmdEnable:
-            {
-            if ( pageIndex == ECipherSuitePage )
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                iUiCipherSuites->At( index ).iIsEnabled = ETrue;
-                iCipherSuites->Update();
-                DrawCipherSuitesL();
-                CEikButtonGroupContainer& cba = ButtonGroupContainer();
-                cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-                cba.DrawDeferred();
-                }
-            else if ( pageIndex == EEapTypePage )
-                {
-                TInt cur = iEapTypesListBox->CurrentItemIndex();
-                iUiEapTypes->At( cur ).iIsEnabled = ETrue;
-
-                iEapTypes->Update();
-
-                // enabling moves item to the top of the list
-                MoveEapTypeL( cur, 0 );                
-
-                // load the new CBA from resource
-                CEikButtonGroupContainer& cba = ButtonGroupContainer();                
-                cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_CONFIGURE );
-                cba.DrawDeferred();
-                }                
-            break;
-            }
-
-        case ETtlsUiCmdDisable:
-            {
-            if ( pageIndex == ECipherSuitePage )
-                {
-                TInt index = iCipherSuiteListBox->CurrentItemIndex();
-                iUiCipherSuites->At( index ).iIsEnabled = EFalse;
-                iCipherSuites->Update();
-                DrawCipherSuitesL();    
-                CEikButtonGroupContainer& cba = ButtonGroupContainer();
-                cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                cba.DrawDeferred();        
-                }            
-            else if ( pageIndex == EEapTypePage )
-                {
-                TInt itemIndex = iEapTypesListBox->CurrentItemIndex();
-
-                if( GetEnabledEapTypeCount() > KMinEnabledCount )
-                    {
-                    // disabling moves item just after the last enabled one,
-                    // so find that position
-                    TInt next = itemIndex;
-                    
-                    while ( next < iUiEapTypes->Count() - 1 &&
-                            iUiEapTypes->At( next ).iIsEnabled )
-                        {
-                        ++next;
-                        }
-
-                    if ( next > itemIndex && 
-                         !iUiEapTypes->At( next ).iIsEnabled ) 
-                        {
-                        --next;
-                        }
-
-
-                    iUiEapTypes->At( itemIndex ).iIsEnabled = EFalse;
-
-                    // move item if needed
-                    MoveEapTypeL( itemIndex, next );
-                    iEapTypes->Update();                
-
-                    // Highlight follows movement.
-                    //iEapTypesListBox->SetCurrentItemIndex( next );
-                    
-                    // load the new CBA from resource
-                    CEikButtonGroupContainer& cba = ButtonGroupContainer();
-                    cba.SetCommandSetL( 
-                                     R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-                    cba.DrawDeferred();
-                    }
-                else
-                    {
-                    HBufC* stringLabel;
-                    stringLabel = StringLoader::LoadL(
-                                R_TTLS_INFO_CANNOT_DISABLE_ALL_EAP_PLUGINS,
-                                                       iEikonEnv );
-                    CleanupStack::PushL( stringLabel );
-                    CAknInformationNote* dialog = new ( ELeave )
-                                                CAknInformationNote( ETrue );
-                    dialog->ExecuteLD( *stringLabel );
-                    CleanupStack::PopAndDestroy( stringLabel );
-                    }
-                }
-            break;
-            }
-
-        case ETtlsUiCmdConfigure:
-            {
-            if ( pageIndex == EEapTypePage )
-                {
-                ConfigureL(EFalse);
-                }
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::PageChangedL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::PageChangedL( TInt aPageId )
-    {
-    if ( !iIsUIConstructionCompleted )
-        {
-        return;
-        }
-
-    if ( aPageId == KEAPTTLSSETTINGSPAGE )
-        {
-        if (iSettingListBox->ScrollBarFrame())
-            {
-            iSettingListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(ETrue);
-            }
-        if (iEapTypesListBox->ScrollBarFrame())
-            {
-            iEapTypesListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iCipherSuiteListBox->ScrollBarFrame())
-            {
-            iCipherSuiteListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        }
-     else if ( aPageId == KEAPTTLSEAPPAGE )
-        {
-        if (iSettingListBox->ScrollBarFrame())
-            {
-            iSettingListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iEapTypesListBox->ScrollBarFrame())
-            {
-            iEapTypesListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(ETrue);
-            }
-        if (iCipherSuiteListBox->ScrollBarFrame())
-            {
-            iCipherSuiteListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        }
-    else if ( aPageId == KEAPTTLSCIPHERPAGE )
-        {
-        if (iSettingListBox->ScrollBarFrame())
-            {
-            iSettingListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iEapTypesListBox->ScrollBarFrame())
-            {
-            iEapTypesListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(EFalse);
-            }
-        if (iCipherSuiteListBox->ScrollBarFrame())
-            {
-            iCipherSuiteListBox->ScrollBarFrame()->ComponentControl(0)->MakeVisible(ETrue);
-            }
-        }
-        
-    CEikButtonGroupContainer& cba = ButtonGroupContainer();
-    if( aPageId == KEAPTTLSSETTINGSPAGE )
-        {
-        cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_EDIT );
-        }
-    else if( aPageId == KEAPTTLSEAPPAGE )
-        {
-        cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_CONFIGURE );
-        }
-    else if( aPageId == KEAPTTLSCIPHERPAGE )
-        {
-        TInt index = iCipherSuiteListBox->CurrentItemIndex();
-        if( ( *iUiCipherSuites )[ index ].iIsEnabled )
-            {
-            cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_DISABLE );
-            }
-        else
-            {
-            cba.SetCommandSetL( R_TTLS_UI_SOFTKEYS_OPTIONS_BACK_ENABLE );
-            }
-        }
-    cba.DrawDeferred();
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::ShowSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::ShowSettingPageL( TInt aCalledFromMenu )
-    {
-    TInt index = iSettingListBox->CurrentItemIndex();
-    if ( index == EUserCertificateItem )
-        {
-        TInt activeUserCertificate = CheckActiveUserCertificate();
-        CDesCArrayFlat* tempArray = new( ELeave )CDesCArrayFlat( 
-                                                KCertificateArrayGranularity );
-        CleanupStack::PushL( tempArray );
-    
-        TDesC* noneText = iEikonEnv->AllocReadResourceLC( 
-                                                    R_TTLS_NONE_SELECTION );
-        tempArray->InsertL( 0, *noneText );
-        CleanupStack::PopAndDestroy( noneText );
-    
-        for ( TInt i = 0; i < iUiUserCertificates->Count() ; i++ )
-            {
-            TEapTlsPeapUiCertificate certificate = 
-                                                iUiUserCertificates->At( i );
-            SCertEntry entry = certificate.iCertEntry;
-			TBuf<KMaxFullCertLabelLength> text;
-			GetFullCertLabelL( entry, text);
-			tempArray->InsertL( i+1, text );
-            }
-        TInt selected( 0 );    
-        if ( activeUserCertificate == KErrNotFound )
-            {
-            selected = ShowRadioButtonSettingPageL( R_TTLS_USER_CERT_STRING, 
-                                                    tempArray, 0 );
-            }
-        else 
-            {
-            selected = ShowRadioButtonSettingPageL( R_TTLS_USER_CERT_STRING, 
-                                                    tempArray, 
-                                                    activeUserCertificate+1 );
-                                    //Plus 1 cause we added 'none' selection
-            }
-
-        CleanupStack::PopAndDestroy( tempArray );
-        UserCertificateHouseKeeping( selected );    
-        iCertificates->Update();
-        DrawSettingsListL(); // List must be drawn again at this stage
-        }
-    else if ( index == ECaCertificateItem )
-        {
-        TInt activeCaCertificate = CheckActiveCaCertificate();
-
-        CDesCArrayFlat* tempArray = new( ELeave )CDesCArrayFlat( 
-                                                KCertificateArrayGranularity );
-        CleanupStack::PushL( tempArray );
-
-        TDesC* noneText = iEikonEnv->AllocReadResourceLC( 
-                                                    R_TTLS_NONE_SELECTION );
-        tempArray->InsertL( 0, *noneText );
-        CleanupStack::PopAndDestroy( noneText );
-
-        for ( TInt i = 0; i < iUiCACertificates->Count(); i++ )
-            {
-            TEapTlsPeapUiCertificate certificate = iUiCACertificates->At( i );
-            SCertEntry entry = certificate.iCertEntry;
-            TBuf<KMaxFullCertLabelLength> text;
-			GetFullCertLabelL( entry, text );
-			tempArray->InsertL( i+1, text );
-            }
-
-        TInt selected( 0 );
-        if ( activeCaCertificate == KErrNotFound )
-            {
-            selected = ShowRadioButtonSettingPageL( R_TTLS_CA_CERT_STRING, 
-                                                    tempArray, 0 );        
-            }
-        else
-            {
-            selected = ShowRadioButtonSettingPageL( R_TTLS_CA_CERT_STRING, 
-                                                    tempArray, 
-                                                    activeCaCertificate+1 );
-                                    //Plus 1 cause we added 'none' selection
-            }
-        CleanupStack::PopAndDestroy( tempArray );
-        CaCertificateHouseKeeping( selected );
-        iCertificates->Update();
-        DrawSettingsListL(); // List must be drawn again at this stage
-        }
-    else
-        {
-        CAknSettingItem* item = iSettingArray->Array()->At( index );
-        item->EditItemL( aCalledFromMenu );
-        item->StoreL();
-        }
-
-    DrawNow();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapPeapUiDialog::MoveEapTypeL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::MoveEapTypeL( TInt aOldPos, TInt aNewPos )
-    {
-    TEapTlsPeapUiEapType originalUpper = iUiEapTypes->At( aOldPos );
-    iUiEapTypes->Delete( aOldPos );
-    iUiEapTypes->InsertL( aNewPos, originalUpper );
-    iUiEapTypes->Compress();    // Might not be needed
-    iEapTypes->Update();
-    DrawEapListL( aNewPos );
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::DrawEapListL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::DrawEapListL( TInt aWantedIndex )
-    {    
-    iEapTypeViewArray->Reset();
-    RImplInfoPtrArray eapArray;
-    eapArray.Reset();
-
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, eapArray );
-    for ( TInt i = 0; i < iUiEapTypes->Count(); i++ )
-        {
-        TBuf<KMaxLengthOfEapLine> tempLine;
-        
-        if ( iUiEapTypes->At( i ).iIsEnabled )
-            {
-            _LIT( KNumTab, "%d\t" );
-            tempLine.AppendFormat( KNumTab, i+1 );
-            }
-        else
-            {
-            _LIT( KTab, "\t" );
-            tempLine.Append( KTab );
-            }
-        
-        for ( TInt index = 0; index < eapArray.Count(); index++ )
-            {
-            if ( eapArray[index]->DataType() == iUiEapTypes->At( i ).iEapType )
-                {
-                tempLine.Append( eapArray[index]->DisplayName() );
-                break;
-                }
-            }
-
-        if ( iUiEapTypes->At( i ).iIsEnabled )
-            {       // Add mark icon to indicate that the eap type is enabled
-            _LIT( KTab0, "\t0" );
-            tempLine.Append( KTab0 );
-            }
-
-        iEapTypeViewArray->InsertL( i, tempLine );
-        }
-
-    eapArray.ResetAndDestroy();
-    iEapTypesListBox->Model()->SetItemTextArray( iEapTypeViewArray );
-    iEapTypesListBox->HandleItemAdditionL();
-    iEapTypesListBox->SetCurrentItemIndex( aWantedIndex );
-    iEapTypesListBox->DrawDeferred();
-    iEapTypesListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::ShowRadioButtonSettingPageL
-// -----------------------------------------------------------------------------
-//
-TInt CEapTtlsUiDialog::ShowRadioButtonSettingPageL( TInt aTitle, 
-                                                    CDesCArrayFlat* aValues, 
-                                                    TInt aCurrentItem )
-    {
-    // title of the dialog
-    HBufC* title = iCoeEnv->AllocReadResourceLC( aTitle );
-
-    // We have everything to create dialog
-    CAknRadioButtonSettingPage* dlg = new( ELeave )CAknRadioButtonSettingPage(
-                                                R_RADIO_BUTTON_SETTING_PAGE,
-                                                aCurrentItem, 
-                                                aValues );
-    CleanupStack::PushL( dlg );
-    dlg->SetSettingTextL( *title ); 
-    CleanupStack::Pop( dlg );
-    dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged );
-    CleanupStack::PopAndDestroy( title ); // title
-    // index must be re-turned upside down, because options list is upside down
-    return aCurrentItem;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::DrawCipherSuitesL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::DrawCipherSuitesL()
-    {
-    iCipherSuitesViewArray->Reset();
-    TInt listCount( 0 );
-    TBuf<KMaxLengthOfSuiteName> temp;
-    for ( TInt i = 0; i < iUiCipherSuites->Count(); i++ )
-        {
-        temp.Zero();
-        _LIT( KTab, "\t" );
-        temp.Append( KTab ); 
-
-        TEapTlsPeapUiCipherSuite suite = iUiCipherSuites->At( i );
-        TUint32 suiteId = suite.iCipherSuite;
-
-        switch( suiteId )
-            {
-            case 0x0004:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TTLS_SUITE_RSARC4MD5 );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x0005:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TTLS_SUITE_RSARC4SHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x000a:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TTLS_SUITE_RSA3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );
-                break;
-                }
-
-            case 0x0016:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TTLS_SUITE_DHERSA3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );            
-                break;
-                }
-
-            case 0x0013:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TTLS_SUITE_DHEDSS3DESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );        
-                break;
-                }
-
-            case 0x002F:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TTLS_SUITE_RSAAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );                
-                break;
-                }
-
-            case 0x0032:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TTLS_SUITE_DHERSAAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );        
-                break;
-                }
-
-            case 0x0033:
-                {
-                HBufC* suite = iCoeEnv->AllocReadResourceLC( 
-                                                R_TTLS_SUITE_DHEDSSAESSHA );
-                temp.Append( *suite );
-                CleanupStack::PopAndDestroy( suite );                     
-                break;
-                }
-
-            default:
-                {
-                temp.Append( KEmptyString );
-                break;
-                }
-             }
-
-        if ( iUiCipherSuites->At( i ).iIsEnabled )
-            {       // Add mark icon to indicate that the suite is enabled
-            _LIT( KTab0, "\t0" );
-            temp.Append( KTab0 );
-            }
-
-        iCipherSuitesViewArray->InsertL( listCount, temp );
-        listCount++;                
-        }
-
-    iCipherSuiteListBox->Model()->SetItemTextArray( iCipherSuitesViewArray );
-    iCipherSuiteListBox->HandleItemAdditionL();
-    iCipherSuiteListBox->DrawDeferred();
-    iCipherSuiteListBox->UpdateScrollBarsL();        
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::CheckActiveUserCertificate
-// -----------------------------------------------------------------------------
-//
-TInt CEapTtlsUiDialog::CheckActiveUserCertificate()
-    {
-    for ( TInt i = 0; i < iUiUserCertificates->Count(); i++ )
-        {
-        if ( iUiUserCertificates->At( i ).iIsEnabled )
-            {
-            return i;
-            }
-        }
-    
-    return KErrNotFound;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::CheckActiveCaCertificate
-// -----------------------------------------------------------------------------
-//
-TInt CEapTtlsUiDialog::CheckActiveCaCertificate()
-    {
-    for ( TInt i = 0; i < iUiCACertificates->Count(); i++ )
-        {
-        if ( iUiCACertificates->At( i ).iIsEnabled )
-            {
-            return i;
-            }
-        }
-
-    return KErrNotFound;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::UserCertificateHouseKeeping
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::UserCertificateHouseKeeping( TInt aSelected )
-    {
-    for ( TInt i = 0; i < iUiUserCertificates->Count(); i++ )
-        {
-        iUiUserCertificates->At( i ).iIsEnabled = EFalse;
-        }
-
-    if ( aSelected != 0 ) // Zero index is none
-        {
-        iUiUserCertificates->At( aSelected-1 ).iIsEnabled = ETrue;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::CaCertificateHouseKeeping
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::CaCertificateHouseKeeping( TInt aSelected )
-    {
-    for ( TInt i = 0; i < iUiCACertificates->Count(); i++ )
-        {
-        iUiCACertificates->At( i ).iIsEnabled = EFalse;
-        }
-
-    if ( aSelected != 0 ) // Zero index is none
-        {        
-        iUiCACertificates->At( aSelected-1 ).iIsEnabled = ETrue;    
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::CreateEapTypeDataBaseL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::CreateEapTypeDataBaseL()
-    {
-    RImplInfoPtrArray eapArray;
-    eapArray.Reset();
-
-    REComSession::ListImplementationsL( KEapTypeInterfaceUid, eapArray );
-    TInt allowedInTtlsCount( 0 );
-    for ( TInt i = 0; i < eapArray.Count(); i++ )
-        {
-        if ( !CEapType::IsDisallowedInsideTTLS(*eapArray[i]) )
-            {
-            CImplementationInformation* info = eapArray[i];
-            TEapTlsPeapUiEapType tempEapType;
-            tempEapType.iEapType = info->DataType();
-            
-            // BINARY RESOURCE DATA
-            
-            // [FE] [00 00 00] [TEapType_bigendian]
-            // OR
-            // [FE] [FF FF FF] [MSCHAPv2_bigendian]
-            
-            _LIT8( KExpEapFirstQuad, "\xFE\0\0\0" );
-            TPtrC8 firstQuad( tempEapType.iEapType.Ptr(), 4 );
-            // TUint32 dataType = BigEndian::Get32( tempEapType.iEapType.Ptr()+4 );
-            TUint32 dataType = ( tempEapType.iEapType[4] << 24 ) |
-                               ( tempEapType.iEapType[5] << 16 ) |
-                               ( tempEapType.iEapType[6] << 8 ) |
-                               tempEapType.iEapType[7];
-            
-    
-            if ( !firstQuad.Compare( KExpEapFirstQuad ) && 
-                 ( dataType == EAPSettings::EEapSim || 
-                   dataType == EAPSettings::EEapAka ) )
-                {
-                tempEapType.iIsEnabled = ETrue;
-                iUiEapTypes->InsertL( KFirstElement, tempEapType );
-                }
-            else
-                {
-                tempEapType.iIsEnabled = EFalse;
-                iUiEapTypes->InsertL( allowedInTtlsCount, tempEapType );
-                }
-
-            allowedInTtlsCount++;
-            }
-        }
-
-    __ASSERT_DEBUG( iUiEapTypes->Count() >= 2, User::Panic( _L("EAP-SIM/AKA missing"), 1) );
-    
-    // Check if EAP-SIM and EAP-AKA are in correct order
-    
-    // BINARY RESOURCE DATA
-    const TDesC8& firstEap = iUiEapTypes->At( KFirstElement ).iEapType;
-    const TDesC8& secondEap = iUiEapTypes->At( KSecondElement ).iEapType;
-    
-    TUint32 dataTypeFirst = ( firstEap[4] << 24 ) |
-                            ( firstEap[5] << 16 ) |
-                            ( firstEap[6] << 8 ) |
-                            firstEap[7];
-    TUint32 dataTypeSecond = ( secondEap[4] << 24 ) |
-                             ( secondEap[5] << 16 ) |
-                             ( secondEap[6] << 8 ) |
-                             secondEap[7];
-
-    // If not, switch them
-    if ( dataTypeFirst == EAPSettings::EEapAka &&
-        dataTypeSecond == EAPSettings::EEapSim )
-        {
-        TEapTlsPeapUiEapType tempEapType = iUiEapTypes->At( KFirstElement );
-        iUiEapTypes->Delete( KFirstElement );
-        iUiEapTypes->InsertL( KSecondElement, tempEapType );
-        }
-    
-    iEapTypes->Update();
-    eapArray.ResetAndDestroy();        
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::SetCipherIconsL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::SetCipherIconsL()
-    {
-    CArrayPtr< CGulIcon >* icons = new( ELeave ) CAknIconArray( 1 );
-    CleanupStack::PushL( icons );
-
-    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-
-    CGulIcon* icon = CGulIcon::NewLC();
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* mask = NULL;    
-    AknsUtils::CreateColorIconL( skinInstance,
-                                 KAknsIIDQgnIndiMarkedAdd, 
-                                 KAknsIIDQsnIconColors, 
-                                 EAknsCIQsnIconColorsCG13, 
-                                 bitmap, 
-                                 mask, 
-                                 AknIconUtils::AvkonIconFileName(),
-                                 EMbmAvkonQgn_indi_marked_add, 
-                                 EMbmAvkonQgn_indi_marked_add_mask,
-                                 KRgbBlack );
-    icon->SetBitmap( bitmap );
-    icon->SetMask( mask );    
-    icons->AppendL( icon );
-                
-    CleanupStack::Pop( icon ); 
-    CleanupStack::Pop( icons ); // icons
-    
-    iCipherSuiteListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-  
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::SetEapIconsL
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::SetEapIconsL()
-    {
-    CArrayPtr< CGulIcon >* icons = new( ELeave ) CAknIconArray( 1 );
-    CleanupStack::PushL( icons );
-
-    MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-
-    CGulIcon* icon = CGulIcon::NewLC();
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* mask = NULL;    
-    AknsUtils::CreateColorIconL( skinInstance,
-                                 KAknsIIDQgnIndiMarkedAdd, 
-                                 KAknsIIDQsnIconColors, 
-                                 EAknsCIQsnIconColorsCG13, 
-                                 bitmap, 
-                                 mask, 
-                                 AknIconUtils::AvkonIconFileName(),
-                                 EMbmAvkonQgn_indi_marked_add, 
-                                 EMbmAvkonQgn_indi_marked_add_mask,
-                                 KRgbBlack );
-    icon->SetBitmap( bitmap );
-    icon->SetMask( mask );    
-    icons->AppendL( icon );
-                
-    CleanupStack::Pop( icon ); 
-    CleanupStack::Pop( icons ); // icons
-
-    iEapTypesListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::GetEnabledEapTypeCount
-// -----------------------------------------------------------------------------
-//
-TUint CEapTtlsUiDialog::GetEnabledEapTypeCount()
-    {
-    TUint itemCount( 0 );
-    for( TInt i( 0 ); i < iUiEapTypes->Count(); ++i )
-        {
-        if( iUiEapTypes->At( i ).iIsEnabled )
-            {
-            ++itemCount;
-            }
-        }
-    return itemCount;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::IsPlainMschapv2Enabled
-// -----------------------------------------------------------------------------
-//
-TBool CEapTtlsUiDialog::IsPlainMschapv2Enabled()
-    {
-    TBool isEnabled( EFalse );
-    for( TUint i( 0 ); i < iUiEapTypes->Count(); ++i )
-        {
-        // was: _LIT8( KPlainMsChapV2ExpandedId, "\xFE\xFF\xFF\xFF\0\0\0\x1A" );
-        // workaround:
-        _LIT8( KPlainMsChapV2ExpandedId, "\xFE\xFF\xFF\xFF\0\0\0\x63" );
-
-        const TDesC8& currEap = iUiEapTypes->At( i ).iEapType;
-
-        if ( !currEap.Compare( KPlainMsChapV2ExpandedId ) )
-            {
-            isEnabled = iUiEapTypes->At( i ).iIsEnabled;
-            break;
-            }
-
-        }
-    return isEnabled;
-    }
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::IsPapEnabled
-// -----------------------------------------------------------------------------
-//
-TBool CEapTtlsUiDialog::IsPapEnabled()
-    {
-    TBool isEnabled( EFalse );
-    for( TUint i( 0 ); i < iUiEapTypes->Count(); ++i )
-        {
-        _LIT8( KPapExpandedId, "\xFE\xFF\xFF\xFF\0\0\0\x62" );
-        const TDesC8& currEap = iUiEapTypes->At( i ).iEapType;
-        if ( !currEap.Compare( KPapExpandedId ) )
-            {
-            isEnabled = iUiEapTypes->At( i ).iIsEnabled;
-            break;
-            }
-        }
-    return isEnabled;
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CEapTtlsUiDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CEapTtlsUiDialog::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-
-void CEapTtlsUiDialog::GetFullCertLabelL( const SCertEntry& aCert, 
-                                         TDes& aFullLabel )
-    {
-    TInt length = 0;
-
-	// For label.
-    length += aCert.iLabel.Length();
-
-	// For separator between label and primary name.    
-    length += KNameSeparator.iTypeLength;    
-    
-    // For primary name.
-    length += aCert.iPrimaryName.Length();
-
-    if ( !( aCert.iLabel.Length() ) )
-        {	
-    	// For secondary name.
-	    length += aCert.iSecondaryName.Length();
-        }
-    
-    if( length > aFullLabel.MaxLength() )
-        {
-#if defined(_DEBUG) || defined(DEBUG)
-		RDebug::Print(_L("CEapTtlsUiDialog::GetFullCertLabelL - ERROR! Length Mismatch in Certificate's full name\n") );
-#endif
-        }
-
-    HBufC* label = HBufC::NewL( length );
-    label->Des().Append( aCert.iLabel );
-
-    label->Des().Append( KNameSeparator );
-    label->Des().Append( aCert.iPrimaryName );
-
-    if ( !( aCert.iLabel.Length() ) )
-        {
-    	// Secondary name, only if no label. Certificate manager does the same way.
-	    label->Des().Append( aCert.iSecondaryName );
-        }
-            
-	aFullLabel.Copy( label->Des().Left( aFullLabel.MaxLength() ) );   
-    
-    delete label;
-    label = NULL;
-    }
-
-
-// End of file
--- a/wlansecuritysettings/wlaneapsettingsui/bwinscw/eapfastnotifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-	?NotifierArray@@YAPAV?$CArrayPtr@VMEikSrvNotifierBase2@@@@XZ @ 2 NONAME ; class CArrayPtr<class MEikSrvNotifierBase2> * NotifierArray(void)
-
--- a/wlansecuritysettings/wlaneapsettingsui/bwinscw/gtcnotifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NotifierArray@@YAPAV?$CArrayPtr@VMEikSrvNotifierBase2@@@@XZ @ 1 NONAME ; class CArrayPtr<class MEikSrvNotifierBase2> * NotifierArray(void)
-
--- a/wlansecuritysettings/wlaneapsettingsui/bwinscw/leapnotifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NotifierArray@@YAPAV?$CArrayPtr@VMEikSrvNotifierBase2@@@@XZ @ 1 NONAME ; class CArrayPtr<class MEikSrvNotifierBase2> * NotifierArray(void)
-
--- a/wlansecuritysettings/wlaneapsettingsui/bwinscw/mschapv2notifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NotifierArray@@YAPAV?$CArrayPtr@VMEikSrvNotifierBase2@@@@XZ @ 1 NONAME ; class CArrayPtr<class MEikSrvNotifierBase2> * NotifierArray(void)
-
--- a/wlansecuritysettings/wlaneapsettingsui/bwinscw/papnotifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NotifierArray@@YAPAV?$CArrayPtr@VMEikSrvNotifierBase2@@@@XZ @ 1 NONAME ; class CArrayPtr<class MEikSrvNotifierBase2> * NotifierArray(void)
-
--- a/wlansecuritysettings/wlaneapsettingsui/eabi/eapfastnotifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-	_Z13NotifierArrayv @ 2 NONAME
-	_ZTI19CEapFastPacPwDialog @ 3 NONAME ; #<TI>#
-	_ZTI20CEapFastDialogPlugin @ 4 NONAME ; #<TI>#
-	_ZTI21CEapFastPacFileDialog @ 5 NONAME ; #<TI>#
-	_ZTV19CEapFastPacPwDialog @ 6 NONAME ; #<VT>#
-	_ZTV20CEapFastDialogPlugin @ 7 NONAME ; #<VT>#
-	_ZTV21CEapFastPacFileDialog @ 8 NONAME ; #<VT>#
-
--- a/wlansecuritysettings/wlaneapsettingsui/eabi/gtcnotifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
-	_Z13NotifierArrayv @ 1 NONAME
-	_ZTI16CGtcDialogPlugin @ 2 NONAME ; #<TI>#
-	_ZTI23CGTCResponseQueryDialog @ 3 NONAME ; #<TI>#
-	_ZTI24CGTCMessageDisplayDialog @ 4 NONAME ; #<TI>#
-	_ZTV16CGtcDialogPlugin @ 5 NONAME ; #<VT>#
-	_ZTV23CGTCResponseQueryDialog @ 6 NONAME ; #<VT>#
-	_ZTV24CGTCMessageDisplayDialog @ 7 NONAME ; #<VT>#
-
--- a/wlansecuritysettings/wlaneapsettingsui/eabi/leapnotifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXPORTS
-	_Z13NotifierArrayv @ 1 NONAME
-	_ZTI11CLeapDialog @ 2 NONAME ; #<TI>#
-	_ZTI17CLeapDialogPlugin @ 3 NONAME ; #<TI>#
-	_ZTV11CLeapDialog @ 4 NONAME ; #<VT>#
-	_ZTV17CLeapDialogPlugin @ 5 NONAME ; #<VT>#
-
--- a/wlansecuritysettings/wlaneapsettingsui/eabi/mschapv2notifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXPORTS
-	_Z13NotifierArrayv @ 1 NONAME
-	_ZTI15CMsChapv2Dialog @ 2 NONAME ; #<TI>#
-	_ZTI21CMsChapv2DialogPlugin @ 3 NONAME ; #<TI>#
-	_ZTV15CMsChapv2Dialog @ 4 NONAME ; #<VT>#
-	_ZTV21CMsChapv2DialogPlugin @ 5 NONAME ; #<VT>#
-
--- a/wlansecuritysettings/wlaneapsettingsui/eabi/papnotifdlgu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	_Z13NotifierArrayv @ 1 NONAME
-	_ZTI14CPapAuthDialog @ 2 NONAME ; #<TI>#
-	_ZTI21CPapNotifDialogPlugin @ 3 NONAME ; #<TI>#
-	_ZTI22CPapChallengeMsgDialog @ 4 NONAME ; #<TI>#
-	_ZTI24CPapChallengeReplyDialog @ 5 NONAME ; #<TI>#
-	_ZTV14CPapAuthDialog @ 6 NONAME ; #<VT>#
-	_ZTV21CPapNotifDialogPlugin @ 7 NONAME ; #<VT>#
-	_ZTV22CPapChallengeMsgDialog @ 8 NONAME ; #<VT>#
-	_ZTV24CPapChallengeReplyDialog @ 9 NONAME ; #<VT>#
-
--- a/wlansecuritysettings/wlaneapsettingsui/eapnotifwrapper/data/2000cf2e.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP Notifier wrapper resource file
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#include <ecom/registryinfo.rh>
-#include <uikon.hrh>
-
-RESOURCE REGISTRY_INFO theInfo
-{
-	dll_uid = 0x2000cf2e;
-	interfaces =
-	{
-	INTERFACE_INFO
-		{
-		interface_uid = KUikonUidPluginInterfaceNotifiers;
-		implementations =
-				{
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = 0x2000cf2f;
-					version_no = 1;
-					display_name = "TTNOTIFY2V2 EAP notifier wrapper plugin";
-					default_data = "TTNOTIFY2V2";
-					opaque_data	 = "0";
-					}
-				};
-		}
-	};
-}
--- a/wlansecuritysettings/wlaneapsettingsui/eapnotifwrapper/inc/eapnotifierdialoguiddefs.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of the UIDs used by Connection Dialogs
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef __EAPNOTIFIERDIALOGUIDDEFS_H__
-#define __EAPNOTIFIERDIALOGUIDDEFS_H__
-
-// INCLUDES
-#include <e32std.h>
-
-
-// CONSTANTS
-
-// UIDs for EAP notifier plugins
-
-// ID of EAP-GTC dialog
-const TUid KUidGtcDialog        = { 0x101f8e7f };
-
-// ID of EAP-MSCHAPv2 dialog
-const TUid KUidMsChapv2Dialog   = { 0x101f8e69 };
-
-// ID of PAP dialog
-const TUid KUidPapDialog = { 0x200159A9 };
-
-#ifdef FF_WLAN_EXTENSIONS
-// ID of EAP-LEAP dialog
-const TUid KUidLeapDialog       = { 0x101f8ea9 };  
-#endif
-
-#endif  // __EAPNOTIFIERDIALOGUIDDEFS_H__ 
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/eapnotifwrapper/src/eapnotifwrapper.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of ecom plugin
-*
-*/
-
-/*
-* %version: tr1cfwln#9 %
-*/
-
-// INCLUDE FILES
-#include "eapnotifierdialoguiddefs.h"
-
-#include <ecom/implementationproxy.h>
-#include <AknNotifierWrapper.h> // link against aknnotifierwrapper.lib
-
-
-// CONSTANTS
-const TInt KMyPriority =  MEikSrvNotifierBase2::ENotifierPriorityLow;
-const TInt KArrayGranularity = 4;
- 
-
-// ---------------------------------------------------------
-// CleanupArray()
-// ---------------------------------------------------------
-//
-void CleanupArray( TAny* aArray )
-    {
-    CArrayPtrFlat<MEikSrvNotifierBase2>*     
-        subjects = static_cast<CArrayPtrFlat<MEikSrvNotifierBase2>*>( aArray );
-    TInt lastInd = subjects->Count()-1;
-    for ( TInt i = lastInd; i >= 0; i-- )
-        {
-        subjects->At( i )->Release();
-        }
-
-    delete subjects;
-    }
-    
-    
-// ---------------------------------------------------------
-// DoCreateNotifierArrayL()
-// ---------------------------------------------------------
-//
-CArrayPtr<MEikSrvNotifierBase2>* DoCreateNotifierArrayL()
-    {
-    CArrayPtrFlat<MEikSrvNotifierBase2>* subjects =
-        new ( ELeave )CArrayPtrFlat<MEikSrvNotifierBase2>( KArrayGranularity );
-    
-    CleanupStack::PushL( TCleanupItem( CleanupArray, subjects ) );
-
-    // Create Wrappers
-    CAknCommonNotifierWrapper* master = NULL;
-
-    // EAP-MSCHAPv2
-    _LIT( KMsChapv2NotifierPluginName, "mschapv2notifdlg.dll" );
-    master = CAknCommonNotifierWrapper::NewL( KUidMsChapv2Dialog,
-                                              KUidMsChapv2Dialog,
-                                              KMyPriority,
-                                              KMsChapv2NotifierPluginName,
-                                              1 );
-
-    CleanupStack::PushL( master );   
-    subjects->AppendL( master );
-    CleanupStack::Pop( master );
-
-
-
-    // EAP-GTC
-    _LIT( KGtcNotifierPluginName, "gtcnotifdlg.dll" );
-
-    // Session owning notifier(if default implementation is enough)
-    master = CAknCommonNotifierWrapper::NewL( KUidGtcDialog,
-                                         KUidGtcDialog,
-                                         KMyPriority,
-                                         KGtcNotifierPluginName,
-                                         1 ); // we don't use synch reply
-
-    CleanupStack::PushL( master );   
-    subjects->AppendL( master );
-    CleanupStack::Pop( master );
-
-  
-    // PAP
-    _LIT( KPapNotifierPluginName, "papnotifdlg.dll" );
-    master = CAknCommonNotifierWrapper::NewL( KUidPapDialog,
-                                              KUidPapDialog,
-                                              KMyPriority,
-                                              KPapNotifierPluginName,
-                                              1 );
-                                              
-    CleanupStack::PushL( master );   
-    subjects->AppendL( master );
-    CleanupStack::Pop( master );
-                                                
-
-
-#ifdef FF_WLAN_EXTENSIONS
-    
-    // EAP-LEAP
-    _LIT( KLeapNotifierPluginName, "leapnotifdlg.dll" );
-    master = CAknCommonNotifierWrapper::NewL( KUidLeapDialog,
-                                              KUidLeapDialog,
-                                              KMyPriority,
-                                              KLeapNotifierPluginName,
-                                              1 );
-
-    CleanupStack::PushL( master );   
-    subjects->AppendL( master );
-    CleanupStack::Pop( master );
-
-#endif
-                                            
-    CleanupStack::Pop();    // array cleanup
-    
-    return subjects;
-    }
-
-
-// ---------------------------------------------------------
-// NotifierArray()
-// ---------------------------------------------------------
-//
-CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
-    // old Lib main entry point
-    {
-    CArrayPtr<MEikSrvNotifierBase2>* array = 0;
-    TRAP_IGNORE( array = DoCreateNotifierArrayL() );
-    return array;
-    }
-
-
-// ---------------------------------------------------------
-// ImplementationTable
-// ---------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
-    {
-#ifdef __EABI__
-    {{0x2000cf2f}, ( TFuncPtr )NotifierArray}
-#else
-    {{0x2000cf2f}, NotifierArray}
-#endif
-    };
-
-// ---------------------------------------------------------
-// ImplementationGroupProxy
-// entry point
-// ---------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( 
-                                                            TInt& aTableCount )
-    {
-    aTableCount = sizeof( ImplementationTable ) / 
-                  sizeof( TImplementationProxy ) ;
-    return ImplementationTable;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/EapAkaUi.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP AKA UI Project mmp file
-*
-*/
-
-/*
-* %version: 21 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET          eapakaui.lib
-TARGETTYPE      lib
-UID             0x1000008d 0x102072A5
-
-
-SOURCEPATH  ../EapAka/ConfigUi/src
-
-SOURCE  EapAkaUi.cpp
-SOURCE  EapAkaUiView.cpp
-SOURCE  EapAkaUiSettingArray.cpp
-
-
-USERINCLUDE     ../EapAka/ConfigUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-// Resource files
-START RESOURCE ../data/EapAkaUi.rss
-
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/EapGtcUi.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP GTC UI Project mmp file
-*
-*/
-
-/*
-* %version: 21 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET          eapgtcui.lib
-TARGETTYPE      lib
-UID             0x1000008d 0x102072A9
-
-
-SOURCEPATH  ../EapGtc/ConfigUi/src
-
-SOURCE  EapGtcUi.cpp
-SOURCE  EapGtcUiView.cpp
-SOURCE  EapGtcUiSettingArray.cpp
-
-
-USERINCLUDE     ../EapGtc/ConfigUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-
-// Resource files
-START RESOURCE ../data/EapGtcUi.rss
-
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/EapMschapv2Ui.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP MsChapV2 UI Project mmp file
-*
-*/
-
-/*
-* %version: 23 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET          eapmschapv2ui.lib
-TARGETTYPE      lib
-UID             0x1000008d 0x102072A8
-
-
-SOURCEPATH  ../EapMschapv2/ConfigUi/src
-
-SOURCE  EapMschapv2Ui.cpp
-SOURCE  EapMschapv2UiView.cpp
-SOURCE  EapMschapv2UiSettingArray.cpp
-
-
-USERINCLUDE     ../EapMschapv2/ConfigUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-
-// Resource files
-START RESOURCE ../data/EapMschapv2Ui.rss
-
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/EapPeapUi.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP PEAP UI Project mmp file
-*
-*/
-
-/*
-* %version: 22 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET          eappeapui.lib
-TARGETTYPE      lib
-UID             0x1000008d 0x102072AA
-
-
-SOURCEPATH  ../EapPeap/ConfigUi/src
-
-SOURCE  EapPeapUi.cpp
-SOURCE  EapPeapUiView.cpp
-SOURCE  EapPeapUiSettingArray.cpp
-
-
-USERINCLUDE     ../EapPeap/ConfigUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-// Resource files
-START RESOURCE ../data/EapPeapUi.rss
-
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/EapPluginConfig.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP Plugin Configuration UI Project mmp file
-*
-*/
-
-/*
-* %version: 23 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET          eappluginconfig.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x102072BB
-CAPABILITY      CAP_ECOM_PLUGIN
-VENDORID        VID_DEFAULT
-
-
-SOURCEPATH      ../EapPluginConfig/src
-
-SOURCE          EAPPluginConfiguration.cpp
-SOURCE          EAPPlugInConfigurationDlg.cpp
-SOURCE          EAPPlugInConfigurationModel.cpp
-SOURCE          EAPPluginList.cpp
-SOURCE          EAPPluginConfigurationProxy.cpp
-
-
-USERINCLUDE     ../EapPluginConfig/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-
-START RESOURCE  ../data/EAPPluginConfigRes.rss
-
-HEADER
-TARGETPATH  RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END  // RESOURCE
-
-
-START RESOURCE  ../data/102072bb.rss
-TARGET eappluginconfig.rsc
-TARGETPATH ECOM_RESOURCE_DIR
-LANGUAGE_IDS
-
-END  // RESOURCE
-
-
-LIBRARY featmgr.lib
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY AknSkins.lib
-LIBRARY AknIcon.lib
-LIBRARY CommonEngine.lib
-LIBRARY HLPLCH.lib      // For Series 60 help
-LIBRARY eikcoctl.lib 
-LIBRARY eikdlg.lib
-LIBRARY eikcore.lib
-LIBRARY cone.lib
-LIBRARY avkon.lib
-LIBRARY bafl.lib 
-LIBRARY egul.lib
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/EapSimUi.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP LEAP UI Project mmp file
-*
-*/
-
-/*
-* %version: 22 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET          eapsimui.lib
-TARGETTYPE      lib
-UID             0x1000008d 0x102072A6
-
-SOURCEPATH  ../EapSim/ConfigUi/src
-
-SOURCE      EapSimUi.cpp
-SOURCE      EapSimUiView.cpp
-SOURCE      EapSimUiSettingArray.cpp
-
-
-USERINCLUDE     ../EapSim/ConfigUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-// Resource files
-START RESOURCE ../data/EapSimUi.rss
-
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/EapTlsUi.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP TLS UI Project mmp file
-*
-*/
-
-/*
-* %version: 21 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET          eaptlsui.lib
-TARGETTYPE      lib
-UID             0x1000008d 0x102072AB
-
-
-SOURCEPATH  ../EapTls/ConfigUi/src
-
-SOURCE      EapTlsUi.cpp
-SOURCE      EapTlsUiView.cpp
-SOURCE      EapTlsUiSettingArray.cpp
-
-
-USERINCLUDE     ../EapTls/ConfigUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-// Resource files
-START RESOURCE ../data/EapTlsUi.rss
-
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/EapTtlsUi.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: EAP TTLS UI Project mmp file
-*
-*/
-
-/*
-* %version: 22 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET          eapttlsui.lib
-TARGETTYPE      lib
-UID             0x1000008d 0x10101219
-
-
-SOURCEPATH	../EapTtls/ConfigUi/src
-
-SOURCE  EapTtlsUi.cpp
-SOURCE  EapTtlsUiView.cpp
-SOURCE  EapTtlsUiSettingArray.cpp
-
-
-USERINCLUDE     ../EapTtls/ConfigUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-
-// Resource files
-START RESOURCE ../data/EapTtlsUi.rss
-
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/GtcNotifDlg.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is project specification file for the GtcNotifDlg
-*
-*/
-
-/*
-* %version: 11.1.11 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET          gtcnotifdlg.dll
-TARGETTYPE      DLL
-UID             0x101FDFAE 0x102072AE 
-CAPABILITY      CAP_GENERAL_DLL
-VENDORID        VID_DEFAULT
-
-
-SOURCEPATH      ../EapGtc/NotifierUi/src
-
-SOURCE          GtcNotifDlgPlugin.cpp 
-SOURCE          GTCResponseQueryDialog.cpp
-SOURCE          GTCMessageDisplayDialog.cpp
-
-
-USERINCLUDE     ../EapGtc/NotifierUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-
-START RESOURCE  ../data/GtcNotifDlgUi.rss
-
-HEADER
-TARGETPATH  RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-
-#if defined(ARMCC)
-    DEFFILE ../eabi/gtcnotifdlg.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/gtcnotifdlg.def
-#elif defined( WINS )
-    DEFFILE ../bwins/gtcnotifdlg.def
-#else
-    DEFFILE ../bmarm/gtcnotifdlg.def
-#endif
-
-
-LIBRARY euser.lib eikdlg.lib eiksrv.lib cone.lib commdb.lib eikcore.lib
-LIBRARY eikcoctl.lib bafl.lib
-LIBRARY avkon.lib
-LIBRARY AknSkins.lib
-LIBRARY charconv.lib
-LIBRARY commonengine.lib
-LIBRARY AknNotify.lib  
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/MsChapv2NotifDlg.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is project specification file for the MsChapv2NotifDlg
-*
-*/
-
-/*
-* %version: 10.1.10 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET          mschapv2notifdlg.dll
-TARGETTYPE      DLL
-UID             0x101FDFAE 0x102072B2
-CAPABILITY      CAP_GENERAL_DLL
-VENDORID        VID_DEFAULT
-
-
-SOURCEPATH      ../EapMschapv2/NotifierUi/src
-
-SOURCE          MsChapv2NotifDlgPlugin.cpp 
-SOURCE          MsChapv2NotifDialog.cpp 
-
-
-USERINCLUDE     ../EapMschapv2/NotifierUi/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-
-START RESOURCE  ../data/MsChapv2NotifDlgUi.rss
-HEADER
-TARGETPATH  RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-
-#if defined(ARMCC)
-    DEFFILE ../eabi/mschapv2notifdlg.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/mschapv2notifdlg.def
-#elif defined( WINS )
-    DEFFILE ../bwins/mschapv2notifdlg.def
-#else
-    DEFFILE ../bmarm/mschapv2notifdlg.def
-#endif
-
-
-LIBRARY euser.lib eikdlg.lib eiksrv.lib cone.lib commdb.lib eikcore.lib
-LIBRARY eikcoctl.lib bafl.lib
-LIBRARY avkon.lib
-LIBRARY AknSkins.lib
-LIBRARY charconv.lib
-LIBRARY commonengine.lib
-LIBRARY AknNotify.lib  
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file provides the information required for building theWLAN EAP Settings UI. 
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// export iby files
-../rom/WlanEapSettingsUi.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(WlanEapSettingsUi.iby)
-../rom/WlanEapSettingsUiResources.iby	LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(WlanEapSettingsUiResources.iby)
-
-// export localised loc file
-../loc/wlaneapsettingsui.loc				MW_LAYER_LOC_EXPORT_PATH(wlaneapsettingsui.loc)
-../EapAka/ConfigUi/loc/eapakaui.loc			MW_LAYER_LOC_EXPORT_PATH(eapakaui.loc)
-../EapGtc/ConfigUi/loc/eapgtcui.loc			MW_LAYER_LOC_EXPORT_PATH(eapgtcui.loc)
-../EapGtc/NotifierUi/loc/gtcnotifdlg.loc		MW_LAYER_LOC_EXPORT_PATH(gtcnotifdlg.loc)
-../EapMschapv2/ConfigUi/loc/eapmschapv2ui.loc		MW_LAYER_LOC_EXPORT_PATH(eapmschapv2ui.loc)
-../EapMschapv2/NotifierUi/loc/mschapv2notifdlg.loc	MW_LAYER_LOC_EXPORT_PATH(mschapv2notifdlg.loc)
-../EapPeap/ConfigUi/loc/eappeapui.loc			MW_LAYER_LOC_EXPORT_PATH(eappeapui.loc)
-../EapSim/ConfigUi/loc/eapsimui.loc			MW_LAYER_LOC_EXPORT_PATH(eapsimui.loc)
-../EapTls/ConfigUi/loc/eaptlsui.loc			MW_LAYER_LOC_EXPORT_PATH(eaptlsui.loc)
-../EapTtls/ConfigUi/loc/eapttlsui.loc			MW_LAYER_LOC_EXPORT_PATH(eapttlsui.loc)
-../pap/configui/loc/papui.loc			MW_LAYER_LOC_EXPORT_PATH(papui.loc)
-../pap/notifierui/loc/papnotifdlg.loc		MW_LAYER_LOC_EXPORT_PATH(papnotifdlg.loc)
-
-PRJ_MMPFILES
-
-// Settings dialogs
-EapSimUi.mmp
-EapTlsUi.mmp
-EapPeapUi.mmp
-EapTtlsUi.mmp
-EapMschapv2Ui.mmp
-EapGtcUi.mmp
-EapAkaUi.mmp
-papui.mmp
-
-// Notifiers components
-MsChapv2NotifDlg.mmp
-GtcNotifDlg.mmp
-papnotifdlg.mmp
-
-
-// Notifier wrapper
-eapnotifwrapper.mmp
-
-// Access Point UI interface module
-EapPluginConfig.mmp
-
-PRJ_TESTMMPFILES
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/eapnotifwrapper.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is project specification file for the eapnotifwrapper
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET      eapnotifwrapper.dll
-TARGETTYPE  PLUGIN 
-UID         0x10009D8D 0x2000CF2E
-VENDORID    VID_DEFAULT
-CAPABILITY  CAP_ECOM_PLUGIN
-
-LANG    SC
-
-SOURCEPATH  ../eapnotifwrapper/src
-SOURCE  eapnotifwrapper.cpp 
-
-USERINCLUDE			../eapnotifwrapper/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-START RESOURCE ../data/2000cf2e.rss 
-TARGET eapnotifwrapper.rsc
-TARGETPATH ECOM_RESOURCE_DIR
-END
-
-
-LIBRARY ecom.lib
-LIBRARY	aknnotifierwrapper.lib
-LIBRARY euser.lib
-
-DEBUGLIBRARY flogger.lib
-DEBUGLIBRARY efsrv.lib
-DEBUGLIBRARY cone.lib 
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/papnotifdlg.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Project specification file for pap/notifierui
-*
-*/
-
-/*
-* %version: 7 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET          papnotifdlg.dll
-TARGETTYPE      DLL
-UID             0x101FDFAE 0x200159AA
-CAPABILITY      CAP_GENERAL_DLL
-VENDORID        VID_DEFAULT
-
-
-SOURCEPATH      ../pap/notifierui/src
-
-SOURCE          papnotifdlgplugin.cpp 
-SOURCE          papauthdialog.cpp
-SOURCE          papchallengemsgdialog.cpp
-SOURCE          papchallengereplydialog.cpp
-
-
-USERINCLUDE     ../pap/notifierui/inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-
-START RESOURCE  ../data/papnotifdlgui.rss
-HEADER
-TARGETPATH  RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-
-#if defined(ARMCC)
-    DEFFILE ../eabi/papnotifdlg.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/papnotifdlg.def
-#elif defined( WINS )
-    DEFFILE ../bwins/papnotifdlg.def
-#else
-    DEFFILE ../bmarm/papnotifdlg.def
-#endif
-
-
-
-LIBRARY euser.lib eikdlg.lib eiksrv.lib cone.lib commdb.lib eikcore.lib
-LIBRARY eikcoctl.lib bafl.lib
-LIBRARY avkon.lib
-LIBRARY AknSkins.lib
-LIBRARY charconv.lib
-LIBRARY commonengine.lib
-LIBRARY AknNotify.lib  
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/group/papui.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Project specification file for pap/configui
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET          papui.lib
-TARGETTYPE      lib
-UID             0x1000008d 0x200159AB
-
-SOURCEPATH  ../pap/configui/src
-
-SOURCE  papui.cpp
-SOURCE  papuisettingarray.cpp
-SOURCE  papuiview.cpp
-SOURCE  papuipwsettingitem.cpp
-
-USERINCLUDE     ../pap/configui/inc
-
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-// Resource files
-START RESOURCE ../data/papui.rss
-
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/loc/wlaneapsettingsui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,424 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Common UI strings for WLAN EAP Plugins
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:Command in options menu. Open configuration settings.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_wlan_options_eap_plugin_configure       "Configure"
-
-
-//d:Command in options menu. Enables a plugin.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_wlan_options_eap_plugin_enable          "Enable"
-
-
-//d:Command in options menu. Disables a plugin.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_wlan_options_eap_plugin_disable         "Disable"
-
-
-//d:MSK text. Open configuration settings.
-//l:control_pane_t3/opt7
-//w:
-//r:3.2
-//
-#define qtn_msk_wlan_eap_configure       "Configure"
-
-
-//d:MSK text. Enables a cipher suite.
-//l:control_pane_t3/opt7
-//w:
-//r:3.2
-//
-#define qtn_msk_wlan_eap_cs_enable          "Enable"
-
-
-//d:MSK text. Disables a cipher suite.
-//l:control_pane_t3/opt7
-//w:
-//r:3.2
-//
-#define qtn_msk_wlan_eap_cs_disable         "Disable"
-
-
-//d:Options list item, command. Selected plugin is moved up one row in a
-//d:numbered EAP type list, where list order represents the priority.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_wlan_options_eap_plugin_priority_up     "Raise priority"
-
-
-//d:Options list item, command. Selected plugin is moved down one row in a
-//d:numbered EAP type list, where list order represents the priority.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_wlan_options_eap_plugin_priority_down   "Lower priority"
-
-
-//d:Info note to the user when he is trying to disable all the EAP plugins
-//l:popup_note_window
-//w:
-//r:3.1
-//
-#define qtn_wlan_info_cannot_disable_all_eap_plugins   "At least one EAP plug-in has to be enabled"
-
-
-//d:The setting item for user name entry
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_username                  "User name"
-
-
-//d:The setting item that specifies what kind of user name is in use.
-//d:Possible options are "From SIM" 
-//d:(qtn_wlan_eap_sett_username_inuse_from_sim), "From certificate" 
-//d:(qtn_wlan_eap_sett_username_inuse_from_cert) or "User-configured"
-//d:(qtn_wlan_eap_sett_username_inuse_user)
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_username_inuse            "User name in use"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_username_inuse
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_username_inuse_from_sim   "From SIM"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_username_inuse
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_username_inuse_from_cert  "From certificate"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_username_inuse
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_username_inuse_user       "User-configured"
-
-
-//d:The setting item is for password promt
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_password                  "Password"
-
-
-//d:The setting item where the user can choose if he should be prompted for the
-//d:password or not. Possible options are "Yes" 
-//d:(qtn_wlan_eap_sett_passprompt_on) or "No" 
-//d:(qtn_wlan_eap_sett_passprompt_off).
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_passprompt                "Prompt password"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_passprompt
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_passprompt_on             "Yes"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_passprompt
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_passprompt_off            "No"
-
-
-//d:The setting item for Realm entry
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_realm                     "Realm"
-
-
-//d:The setting item that specifies what kind of realm is in use.
-//d:Possible options are "From SIM" (qtn_wlan_eap_sett_realm_inuse_from_sim),
-//d:"From certificate" (qtn_wlan_eap_sett_realm_inuse_from_cert) or 
-//d:"User-configured" (qtn_wlan_eap_sett_realm_inuse_user).
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_realm_inuse               "Realm in use"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_realm_inuse
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_realm_inuse_from_sim      "From SIM"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_realm_inuse
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_realm_inuse_from_cert     "From certificate"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_realm_inuse
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_realm_inuse_user          "User-configured"
-
-
-//d:The setting item for user certificate entry
-//d:Possible options are "(not defined)" (qtn_wlan_eap_cert_not_defined),
-//d:"None" (qtn_wlan_eap_cert_none_selection), or one of the installed user
-//d:certificates.
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_user_certificate          "User certificate"
-
-
-//d:The setting item for CA certificate entry.
-//d:Possible options are "(not defined)" (qtn_wlan_eap_cert_not_defined),
-//d:"None" (qtn_wlan_eap_cert_none_selection), or one of the installed user
-//d:certificates.
-//l:list_setting_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_sett_ca_certificate            "CA certificate"
-
-
-//d:Not defined text to qtn_wlan_eap_sett_user_certificate and 
-//d:qtn_wlan_eap_sett_ca_certificate setting items in case
-//d:no certificate has been selected.
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cert_not_defined               "(not defined)"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_user_certificate and
-//d:qtn_wlan_eap_sett_ca_certificate.
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cert_none_selection            "None"
-
-
-//d:Text in the tab for Settings page.
-//l:tabs_2_active_pane_t1/opt1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_tab_settings                   "Settings"
-
-
-//d:Text in the tab for EAP type selection page
-//l:tabs_2_active_pane_t1/opt1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_tab_eap_types                  "EAP types"
-
-
-//d:Text in the tab for Cipher suites selection page
-//l:tabs_2_active_pane_t1/opt1
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_tab_cipher_suites              "Cipher suites"
-
-
-//d:Cipher suite type text in list control
-//l:list_single_number_pane_t1/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cipher_rsarc4md5               "RSA,RC4,MD5"
-
-
-//d:Cipher suite type text in list control
-//l:list_single_number_pane_t1/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cipher_rsarc4sha               "RSA,RC4,SHA"
-
-
-//d:Cipher suite type text in list control
-//l:list_single_number_pane_t1/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cipher_rsa3dessha              "RSA,3DES,SHA"
-
-
-//d:Cipher suite type text in list control
-//l:list_single_number_pane_t1/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cipher_dhersa3dessha           "DHE-RSA,3DES,SHA"
-
-
-//d:Cipher suite type text in list control
-//l:list_single_number_pane_t1/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cipher_dhedss3dessha           "DHE-DSS,3DES,SHA"
-
-
-//d:Cipher suite type text in list control
-//l:list_single_number_pane_t1/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cipher_rsaaessha               "RSA,AES,SHA"
-
-
-//d:Cipher suite type text in list control
-//l:list_single_number_pane_t1/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cipher_dhersaaessha            "DHE-RSA,AES,SHA"
-
-
-//d:Cipher suite type text in list control
-//l:list_single_number_pane_t1/opt2
-//w:
-//r:3.1
-//
-#define qtn_wlan_eap_cipher_dhedssaessha            "DHE-DSS,AES,SHA"
-
-
-//d:The setting item that specifies if TLS privacy is used or not.
-//d:Possible options are "On" 
-//d:(qtn_wlan_eap_sett_tls_privacy_on) or "Off"
-//d:(qtn_wlan_eap_sett_tls_privacy_off)
-//l:list_setting_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_wlan_eap_sett_tls_privacy               "TLS privacy"
-
-
-//d:One of the setting item values for qtn_wlan_eap_sett_tls_privacy
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_wlan_eap_sett_tls_privacy_on            "On"
-
-//d:One of the setting item values for qtn_wlan_eap_sett_tls_privacy
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.2
-//
-#define qtn_wlan_eap_sett_tls_privacy_off           "Off"
-
-
-//d:Information note for user when passwords do not match
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_wlan_eap_info_passwords_do_not_match     "Passwords do not match, try again"
-
-
-//d:Error note for user when password is incorrect
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_wlan_eap_error_incorrect_password       "Incorrect password"
-
-
-//d:The popup query for user to create a PAC store password
-//l:popup_query_data_window
-//w:
-//r:3.2
-//
-#define qtn_wlan_eap_fast_prmpt_create_pac_password      "Create password for the encrypted PAC store:"
-
-
-//d:The popup query for user to verify a PAC store password
-//l:popup_query_data_window
-//w:
-//r:3.2
-//
-#define qtn_wlan_eap_fast_prmpt_verify_password      "Verify password:"
-
-
-//d:The popup query for user to set a PAC store password
-//l:popup_query_data_window
-//w:
-//r:3.2
-//
-#define qtn_wlan_eap_fast_prmpt_pac_password     "PAC store password:"
-
-//d:Default value text for a username setting item whose value has not yet been set. 
-//d:Used for the username setting qtn_wlan_eap_sett_username
-//l:list_set_graphic_pane_t1
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_sett_username_not_defined               "(not defined)"
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/data/papui.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: PAP UI resource file
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-//  RESOURCE IDENTIFIER
-NAME PAPC
-
-//  INCLUDES
-#include <eikon.rh>
-#include "papui.hrh"   // Enums for these resources
-#include <papui.loc>   // Localisation file
-#include <wlaneapsettingsui.loc>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-
-//  CONSTANTS  
-
-#define ESecUiQueryFlags (EGeneralQueryFlags | EEikDialogFlagNotifyEsc | EEikDialogFlagWait)
-
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-
-RESOURCE TBUF16 { buf=""; }
-
-
-RESOURCE CBA r_pap_ui_softkeys_options_back_edit
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EPapUiCmdChange; txt = qtn_msk_change; }
-        };
-    }
-    
-RESOURCE DIALOG r_pap_setting_dialog
-    {
-/*    flags = EEikDialogFlagFillAppClientRect | 
-            EEikDialogFlagCbaButtons | 
-            EEikDialogFlagWait | 
-            EEikDialogFlagNotifyEsc; */
-    
-    flags = EAknDialogSelectionList | EEikDialogFlagWait;
-    buttons = r_pap_ui_softkeys_options_back_edit;
-    items = 
-        { 
-        DLG_LINE
-            {
-            id = EPapSettingsListBox;
-            type = EAknCtSettingListBox;
-            control = LISTBOX 
-                {
-                flags = EAknListBoxMenuList;
-                };
-            }
-        }; 
-    }
-
-
-
-RESOURCE AVKON_SETTING_PAGE r_pap_username_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_wlan_eap_sett_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_pap_username_editor;
-    }
-
-RESOURCE EDWIN r_pap_username_editor 
-    {
-    width = 9;
-    lines = 5;
-    maxlength = KPapUsernameMaxLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    default_case = EAknEditorLowerCase;
-    avkon_flags = EAknEditorFlagLatinInputModesOnly;
-    flags = EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    }
-
-RESOURCE AVKON_SETTING_PAGE r_pap_password_popup_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_password;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_pap_setting_enumerated_popup;
-    }
-    
-RESOURCE POPUP_SETTING_LIST r_pap_setting_enumerated_popup
-    {
-    flags = EAknPopupSettingListFlagInitialised;
-    }
-
-   
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_pap_password_prompt_choices
-    {
-    setting_texts_resource = r_pap_prompt_choices_resource;
-    popped_up_texts_resource = r_pap_prompt_choices_texts_array;
-    }       
-
-RESOURCE ARRAY r_pap_prompt_choices_resource
-    {
-    items=
-        {
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 1; 
-            text = qtn_wlan_eap_pap_sett_password_prompt; 
-            },
-
-        AVKON_ENUMERATED_TEXT 
-            { 
-            value = 0; 
-            text = qtn_wlan_eap_pap_sett_password_udef; 
-            }
-        };
-    }
-    
-RESOURCE ARRAY r_pap_prompt_choices_texts_array
-    {
-    items=
-        {
-        LBUF { txt = qtn_wlan_eap_pap_sett_password_prompt; },
-        LBUF { txt = qtn_wlan_eap_pap_sett_password_udef; }
-        };
-    }
-    
-RESOURCE AVKON_SETTING_PAGE r_pap_password_setting_page
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label = qtn_wlan_eap_sett_password;
-    type = EEikCtSecretEd;
-    editor_resource_id = r_pap_setting_password;
-    }
-
-
-RESOURCE SECRETED r_pap_setting_password 
-    {
-    num_letters = KPapPasswordMaxLength;
-    }    
-
-// No dialog, make this as another setting page, only that
-// it is not visible when setting list is drawn.
-// It can be referred to and opened with the item id defined in .hrh.
-/*RESOURCE DIALOG r_pap_password_dialog
-    {
-    flags=ESecUiQueryFlags;
-    buttons=R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    items=
-        {
-        DLG_LINE
-            {
-            type=EAknCtQuery;
-            id=EGeneralQuery;
-            control= AVKON_DATA_QUERY 
-                { 
-                layout = ECodeLayout;
-                label = qtn_wlan_eap_sett_password;
-                control = SECRETED
-                    { 
-                    num_letters = KPapPasswordMaxLength;
-                    };
-                };
-            }
-        };
-    }
-*/   
-
-RESOURCE MENU_BAR r_pap_menubar
-    {
-    titles =
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_pap_menu_pane; 
-            txt = ""; 
-            }
-        };
-    }
-
-
-RESOURCE MENU_PANE r_pap_menu_pane
-    {
-    items =
-        {
-        MENU_ITEM 
-            { 
-            command = EPapUiCmdChange;
-            txt = qtn_options_change;
-            flags = EEikMenuItemAction; 
-            },
-            
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp;
-            txt = qtn_options_help; 
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdExit;
-            txt = qtn_options_exit; 
-            }           
-        };
-    }
-
-
-// Resource strings
-RESOURCE TBUF r_pap_settings_title              { buf = qtn_wlan_eap_pap_title; }
-RESOURCE TBUF r_pap_username_not_defined        { buf = qtn_wlan_eap_sett_username_not_defined; }
-RESOURCE TBUF r_pap_define_username_info_note   { buf = qtn_wlan_eap_pap_define_user_name; }
-RESOURCE TBUF r_pap_username_setting_title              { buf = qtn_wlan_eap_sett_username; }
-RESOURCE TBUF r_pap_password_setting_title              { buf = qtn_wlan_eap_sett_password; }
- 
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/inc/papui.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: PAP UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _PAPUI_HRH_
-#define _PAPUI_HRH_
-
-#define KPapUsernameMaxLength 253
-#define KPapPasswordMaxLength 128
-
-enum TPapUiMenuCommands
-    {
-    EPapUiCmdUndefined = 6000,
-    EPapUiCmdChange
-    };
-
-enum TPapUiNotes
-    {
-    TPapUiGeneralError = 6100
-    };
-
-enum TPapUiLines
-	{
-	EPapSettingsListBox = 6200
-	};
-
-enum TPapSettingIds
-	{
-	EPapSettingUsernameSettingId=6300,
-	EPapSettingPassPromptSettingId,
-	EPapSettingPasswordSettingId
-	};
-
-enum TPapSettingItemId
-	{
-	EPapSettingPageUserName=6400,
-	EPapSettingPagePasswordPrompt,
-	EPapSettingPagePassword
-	};
-	
-#endif  //_PAPUI_HRH_
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/inc/papuipwsettingitem.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of PAP UI password setting item
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-#ifndef _PAPUIPWSETTINGITEM_H_
-#define _PAPUIPWSETTINGITEM_H_
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-
-// FORWARD DECLARATIONS
-class CPapSettingItemArray;
-
-// CLASS DECLARATION
-
-/**
-*  Password setting item class definition
-*/
-class CPapUiPwSettingItem : public CAknPasswordSettingItem
-    {
-    public:
-    
-        CPapUiPwSettingItem( TInt aIdentifier,
-            enum TAknPasswordSettingItemMode aMode,
-            TDes &aPassword,
-            CPapSettingItemArray* aParent );
-
-        ~CPapUiPwSettingItem();
-        
-                
-    public: // From CAknSettingItem
-        
-        /**
-        * Handles setting page events.
-        * @param aSettingPage  The originating setting page.
-        * @param aEventType A code for the event.
-        */
-        void HandleSettingPageEventL(
-            CAknSettingPage *aSettingPage, TAknSettingPageEvent aEventType );
-            
-    public: // new
-    
-        /**
-        * Deletes the password.
-        */
-        void DeletePasswordL();
-            
-        
-    private:
-        
-        // Reference, not owned
-        CPapSettingItemArray* iParent;		
-    };
-
-
-#endif // _PAPUIPWSETTINGITEM_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/inc/papuisettingarray.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of PAP UI settings array
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-#ifndef _PAPUISETTINGARRAY_H_
-#define _PAPUISETTINGARRAY_H_
-
-// INCLUDES
-#include <aknsettingitemlist.h>
-#include "papui.hrh"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CPapSettingItemArray : public CBase
-    {
-    public:
-        static CPapSettingItemArray* NewL();
-        virtual ~CPapSettingItemArray();
-        CAknSettingItem* Item( TPapSettingItemId aItem );
-        CAknSettingItemArray* Array();
-        void StoreSettingsL();
-        void AddTextItemL( TDes& aBuffer, 
-                           TInt aId, 
-                           TInt aTitleResource, 
-                           TInt aSettingPageResource, 
-                           TInt aAssociatedResource, 
-                           TInt aOrdinal );
-        void AddBinarySettingItemL( TInt aSettingPageResourceId,
-                                    TInt aTitleResourceId,
-                                    TInt aAssociatedResourceId,
-                                    TInt aOrdinal,
-                                    TBool& aModifiedValue );
-        void AddPasswordItemL( TDes& aPassword, 
-                               TInt aId, 
-                               TInt aTitleResource, 
-                               TInt aSettingPageResource, 
-                               TInt aAssociatedResource, 
-                               TInt aOrdinal );
-        void PwItemCancelled( TBool aIsCancelled );                       
-        TBool IsPwItemCancelled();
-                                    
-
-    protected:
-        CPapSettingItemArray();
-        void ConstructL();
- 
-
-    private:
-        CEikonEnv* iEnv;
-        CAknSettingItemArray* iArray;
-        TBool iPwItemCancelled;
-    };
-
-#endif  // _PAPUISETTINGARRAY_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/inc/papuiview.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file of PAP UI setting dialog
-*
-*/
-
-/*
-* %version: 7 %
-*/
-
-#ifndef _PAPUIVIEW_H_
-#define _PAPUIVIEW_H_
-
-// INCLUDES
-#include <AknDialog.h>        // AVKON components
-#include <eikspane.h> // For changing status pane 
-#include <akntitle.h>
-#include <aknnavi.h>
-#include <aknsettingitemlist.h>
-#include <aknlists.h>
-#include <aknselectionlist.h>
-#include <eiklbo.h>
-#include "papui.hrh"
-#include <EapTlsPeapUiConnection.h>
-#include <EapTlsPeapUiDataConnection.h>
-#include <EapTlsPeapUiTlsPeapData.h>
-
-// FORWARD DECLARATIONS
-class CAknSettingStyleListBox;
-class CSettingsListBoxItemDrawer;
-class CPapSettingItemArray;
-
-
-// CLASS DECLARATION
-
-/**
-*  Settings dialog class definition
-*/
-class CPapUiDialog : public CAknDialog,
-                     public MEikListBoxObserver
-    {
-    public:
-        CPapUiDialog( CEapTlsPeapUiConnection* aConnection, 
-                              TInt& aButtonId );
-
-        ~CPapUiDialog();
-
-        /**
-        * Create and launch dialog.
-        * @param aResourceId The resource ID of the dialog to load.
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( TInt aResourceId );
-        
-                
-    public: // From MEikListBoxObserver
-        
-        /**
-        * Handles list box events.
-        * @param aListBox   The originating list box.
-        * @param aEventType A code for the event.
-        */
-        void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );                
-        
-        
-    protected:
-        void PreLayoutDynInitL();
-        TBool OkToExitL( TInt aButtonId );
-        void ProcessCommandL( TInt aCommand );
-
-    private:
-        void ChangeTitleL( TBool aIsStarted );
-        void DrawSettingsListL();
-        void ShowSettingPageL( TInt aCalledFromMenu );
-        void ShowUsernameSettingPageL();
-        void ShowPasswordSettingPageL(); 
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-        
-        /**
-        * Copy the setting data to the eapol db data pointer.
-        */
-        void UpdateEapolData();
-
-
-    private:
-        CEapTlsPeapUiConnection* iConnection;
-        CEapTlsPeapUiDataConnection* iDataConnection;        
-        CEapTlsPeapUiTlsPeapData* iUiData;
-        CPapSettingItemArray* iSettingArray;
-        CAknSettingStyleListBox* iSettingListBox;
-        CAknNavigationControlContainer* iNaviPane;
-        CAknNavigationDecorator* iNaviDecorator;        
-        HBufC* iPreviousText;
-        TInt* iButtonId;
-                
-        // Temporary UI data as shown on the Settings UI
-        TBuf<KPapUsernameMaxLength> iSettingUsername;
-        TBool iSettingPwPrompt;
-        TBuf<KPapPasswordMaxLength> iSettingPassword;
-        
-        
-        // Tells the status of UI construction. TRUE if UI construction is completed.
-		TBool iIsUIConstructionCompleted;
-		
-		TBool iUsernameCancelled;
-    };
-
-
-#endif // _PAPUIVIEW_H_
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/loc/papui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN PAP configuration settings
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:UI title for main view
-//l:title_pane_t2/opt9
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_pap_title     "PAP settings"
-
-
-//d:One of the setting item values for qtn_wlan_eap_pap_sett_password
-//l:list_set_graphic_pane_t1
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_pap_sett_password_prompt     "Prompt"
-
-
-//d:One of the setting item values for qtn_wlan_eap_pap_sett_password
-//l:list_set_graphic_pane_t1
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_pap_sett_password_udef      "User defined"
-
-//d:Information note when user accepts a password but
-//d: the user name is undefined
-//l:popup_note_window
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_pap_define_user_name      "Please define a user name"
-
-
-
-
-
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papui.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PAP UI class
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-// INCLUDE FILES
-#include <papui.h>
-#include <EapTlsPeapUiConnection.h>
-#include "papuiview.h"
-#include <papui.rsg>
-#include <bautils.h>
-#include <coemain.h>
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                               // ROM folder
-_LIT( KResourceFileName, "papui.rsc" );
-
-
-// CLASS DECLARATION
-class TResourceFileCleanupItem
-    {
-    public:
-        CCoeEnv* iCoeEnv;
-        TInt iResourceFileOffset;
-    }; 
-
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupResourceFile
-// -----------------------------------------------------------------------------
-//
-static void CleanupResourceFile( TAny* aObject )
-    {
-    TResourceFileCleanupItem* item = 
-                        REINTERPRET_CAST( TResourceFileCleanupItem*, aObject );
-    item->iCoeEnv->DeleteResourceFile( item->iResourceFileOffset );
-    delete item;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CPapUi::CPapUi
-// -----------------------------------------------------------------------------
-//
-CPapUi::CPapUi( CEapTlsPeapUiConnection* aConnection ) 
-: iConnection( aConnection )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUi::NewL
-// -----------------------------------------------------------------------------
-//
-CPapUi* CPapUi::NewL( CEapTlsPeapUiConnection* aConnection )
-    {
-    CPapUi* self = new( ELeave ) CPapUi( aConnection );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );    
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUi::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CPapUi::ConstructL()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUi::~CPapUi
-// -----------------------------------------------------------------------------
-//
-CPapUi::~CPapUi()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUi::InvokeUiL
-// -----------------------------------------------------------------------------
-//
-TInt CPapUi::InvokeUiL()
-    {
-    TFileName fileName;
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    CCoeEnv* coeEnv = CCoeEnv::Static();
-    
-    BaflUtils::NearestLanguageFile( coeEnv->FsSession(), fileName );
-
-    TResourceFileCleanupItem* item = new( ELeave ) TResourceFileCleanupItem;
-
-    item->iCoeEnv = coeEnv;
-    CleanupStack::PushL( TCleanupItem( CleanupResourceFile, item ) );
-
-    item->iResourceFileOffset = coeEnv->AddResourceFileL( fileName );
-
-    TInt buttonId;
-    CPapUiDialog* settingsDlg = new( ELeave ) CPapUiDialog(
-        iConnection, buttonId );
-        
-    settingsDlg->ConstructAndRunLD( R_PAP_SETTING_DIALOG );
-
-    CleanupStack::PopAndDestroy();  // Resource file
-    
-    return buttonId;
-    }
-
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papuipwsettingitem.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PAP UI password setting item
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-// INCLUDE FILES
-#include "papuipwsettingitem.h"
-#include "papuisettingarray.h"
-#include <aknsettingitemlist.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CPapUiPwSettingItem::CPapUiPwSettingItem
-// -----------------------------------------------------------------------------
-//
-CPapUiPwSettingItem::CPapUiPwSettingItem( TInt aIdentifier,
-            enum TAknPasswordSettingItemMode aMode,
-            TDes &aPassword,
-            CPapSettingItemArray* aParent )
-    : CAknPasswordSettingItem( aIdentifier, aMode, aPassword ),
-      iParent ( aParent )
-    {    
-    }
-
- 
-
-// -----------------------------------------------------------------------------
-// CPapUiPwSettingItem::~CPapUiPwSettingItem
-// -----------------------------------------------------------------------------
-//
-CPapUiPwSettingItem::~CPapUiPwSettingItem()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CPapUiPwSettingItem::HandleSettingPageEventL
-// ---------------------------------------------------------
-//
-void CPapUiPwSettingItem::HandleSettingPageEventL(
-    CAknSettingPage * /*aSettingPage*/, TAknSettingPageEvent aEventType )
-    {
-    #if defined(_DEBUG) || defined(DEBUG)
-    RDebug::Print(_L("CPapUiPwSettingItem::HandleSettingPageEventL, event = %d"),
-        aEventType );
-    #endif
-
-    switch ( aEventType )
-        {
-        case EEventSettingCancelled:
-            {
-            iParent->PwItemCancelled( ETrue );
-            break;
-            }
-        
-        case EEventSettingChanged:             
-        case EEventSettingOked:
-            {
-            iParent->PwItemCancelled( EFalse );            
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }
-    
-// ---------------------------------------------------------
-// CPapUiPwSettingItem::DeletePasswordL
-// ---------------------------------------------------------
-//
-void CPapUiPwSettingItem::DeletePasswordL()
-    {
-    TPtr ptr = InternalTextPtr();
-    ptr.Copy( KNullDesC );
-    StoreL();
-    }
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papuisettingarray.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PAP UI settings array
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-// INCLUDE FILES
-#include "papuisettingarray.h"
-#include "papui.hrh"
-#include "papuipwsettingitem.h"
-#include <papui.rsg>
-#include <aknsettingitemlist.h>
-#include <akntextsettingpage.h>
-
-// CONSTANTS
-_LIT( KEmptyPassword, "****" );
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::CPapSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CPapSettingItemArray::CPapSettingItemArray()
-    {
-    iEnv = CEikonEnv::Static();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::NewL
-// -----------------------------------------------------------------------------
-//
-CPapSettingItemArray* CPapSettingItemArray::NewL() 
-    {
-    CPapSettingItemArray* self = new( ELeave ) CPapSettingItemArray();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self ); // self
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CPapSettingItemArray::ConstructL() 
-    {
-    iArray = new( ELeave ) CAknSettingItemArray( 2, EFalse, 0 );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::~CPapSettingItemArray
-// -----------------------------------------------------------------------------
-//
-CPapSettingItemArray::~CPapSettingItemArray()
-    {
-    if( iArray ) 
-        {
-        // ResetAndDestroy()
-        iArray->ResetAndDestroy();
-        }    
-    delete iArray;   
-    iArray = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::Item
-// -----------------------------------------------------------------------------
-//
-CAknSettingItem* CPapSettingItemArray::Item( TPapSettingItemId aId )
-    {
-    for( TInt i = 0; i < iArray->Count(); i++ )
-        {
-        if( iArray->At( i )->Identifier() == aId )
-            {
-            return iArray->At( i );
-            }
-        }
-
-    __ASSERT_DEBUG( EFalse, User::Invariant() );
-    return NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEapFastSettingItemArray::Array
-// -----------------------------------------------------------------------------
-//
-CAknSettingItemArray* CPapSettingItemArray::Array() 
-    {
-    return iArray;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::StoreSettingsL
-// -----------------------------------------------------------------------------
-//
-void CPapSettingItemArray::StoreSettingsL()
-    {
-    // Do what SettingItemList::StoreSettings would do. 
-    for( TInt i( 0 ); i < iArray->Count(); ++i ) 
-        {
-        iArray->At( i )->StoreL();
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::AddTextItemL
-// -----------------------------------------------------------------------------
-//
-void CPapSettingItemArray::AddTextItemL( TDes& aBuffer, 
-                                             TInt aId, 
-                                             TInt aTitleResource, 
-                                             TInt aSettingPageResource, 
-                                             TInt aAssociatedResource, 
-                                             TInt aOrdinal)
-    {
-    // Create new setting item
-    CAknTextSettingItem* settingItem = 
-                            new( ELeave ) CAknTextSettingItem( aId, aBuffer );
-    CleanupStack::PushL( settingItem );
-    
-    HBufC* usernameNotDefinedText = iEnv->AllocReadResourceLC(
-        R_PAP_USERNAME_NOT_DEFINED );
-    settingItem->SetEmptyItemTextL( *usernameNotDefinedText );
-    CleanupStack::PopAndDestroy( usernameNotDefinedText );
-
-    settingItem->SetSettingPageFlags(
-        CAknTextSettingPage::EZeroLengthNotOffered );
-
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = iEnv->AllocReadResourceLC( aTitleResource );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList,
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    
-    CleanupStack::PopAndDestroy( itemTitle );
-    // Items are destroyed in destructor when resetting array
-    CleanupStack::Pop( settingItem ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::AddBinarySettingItemL
-// -----------------------------------------------------------------------------
-//
-void CPapSettingItemArray::AddBinarySettingItemL( 
-                                                TInt aSettingPageResourceId,
-                                                TInt aTitleResourceId, 
-                                                TInt aAssociatedResourceId,
-                                                TInt aOrdinal, 
-                                                TBool& aModifiedValue )
-    {
-    CAknSettingItem* settingItem = new ( ELeave ) 
-        CAknBinaryPopupSettingItem( 0, aModifiedValue );
-    CleanupStack::PushL( settingItem );
-
-    HBufC* itemTitle = iEnv->AllocReadResourceLC( aTitleResourceId );
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResourceId, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResourceId );
-    iArray->AppendL( settingItem );
-
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }
-    
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::AddPasswordItemL
-// -----------------------------------------------------------------------------
-//
-void CPapSettingItemArray::AddPasswordItemL( TDes& aPassword, 
-                               TInt aId, 
-                               TInt aTitleResource, 
-                               TInt aSettingPageResource, 
-                               TInt aAssociatedResource, 
-                               TInt aOrdinal )
-    {
-    // Create new setting item    
-    CPapUiPwSettingItem* settingItem = new( ELeave ) CPapUiPwSettingItem( aId,
-                                            CAknPasswordSettingItem::EAlpha,
-                                            aPassword, this ); 
-    CleanupStack::PushL( settingItem );
-    settingItem->SetEmptyItemTextL( KEmptyPassword );
-    
-    settingItem->SetSettingPageFlags( 
-                                    CAknTextSettingPage::EZeroLengthAllowed );
-    
-    // Construct setting item with parametrized values
-    HBufC* itemTitle = iEnv->AllocReadResourceLC( aTitleResource );
-   
-
-    settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL, 
-                             aSettingPageResource, EAknCtPopupSettingList, 
-                             NULL, aAssociatedResource );
-    
-    // Append item to settingitem-array
-    iArray->InsertL( aOrdinal, settingItem );
-    
-    CleanupStack::PopAndDestroy( itemTitle );
-    CleanupStack::Pop( settingItem );
-    }
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::PwItemCancelled
-// -----------------------------------------------------------------------------
-//    
-void CPapSettingItemArray::PwItemCancelled( TBool aIsCancelled )                       
-    {
-    iPwItemCancelled = aIsCancelled;
-    }
-
-// -----------------------------------------------------------------------------
-// CPapSettingItemArray::IsPwItemCancelled
-// -----------------------------------------------------------------------------
-//
-TBool CPapSettingItemArray::IsPwItemCancelled()
-    {
-    return iPwItemCancelled;
-    }
- 
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/configui/src/papuiview.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,648 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PAP UI settings dialog
-*
-*/
-
-/*
-* %version: 14 %
-*/
-
-// INCLUDE FILES
-#include "papuiview.h"
-#include "papuisettingarray.h"
-#include "papuipwsettingitem.h"
-#include "papui.hrh"
-#include <papui.rsg>
-#include <eikdialg.h>
-#include <AknDialog.h>
-#include <aknlists.h>
-#include <akntextsettingpage.h>
-#include <aknsettingitemlist.h>
-#include <aknnavi.h>
-#include <aknnavide.h>
-#include <aknnotewrappers.h>
-#include <StringLoader.h>
-#include <EapTlsPeapUiConnection.h>
-#include <EapTlsPeapUiDataConnection.h>
-#include <EapTlsPeapUiTlsPeapData.h>
-#include <featmgr.h>
-#include <hlplch.h>
-
-
-// CONSTANTS
-// UID of general settings app, in which help texts are included
-const TUid KHelpUidPlugin = { 0x100058EC };
- 
-// MODULE DATA STRUCTURES
-enum TSettingIds
-    {
-    EUsernameItem=0,
-    EPasswordPromptItem,
-    EPasswordItem
-    };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::CPapUiDialog
-// -----------------------------------------------------------------------------
-//
-CPapUiDialog::CPapUiDialog( CEapTlsPeapUiConnection* aConnection, 
-                              TInt& aButtonId ) 
-: CAknDialog(),
-  iConnection( aConnection ),
-  iNaviPane( 0 ), 
-  iNaviDecorator( 0 ),   
-  iButtonId( &aButtonId ),
-  iSettingPwPrompt( ETrue ),
-  iIsUIConstructionCompleted( EFalse ),
-  iUsernameCancelled( EFalse )
-    {    
-    }
-
-
-// ---------------------------------------------------------
-// CPapUiDialog::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CPapUiDialog::ConstructAndRunLD( TInt aResourceId )
-    {
-    CleanupStack::PushL( this );
-
-    iSettingArray = CPapSettingItemArray::NewL();
-    
-    User::LeaveIfError( iConnection->Connect() );
-
-    // Basic data
-    iDataConnection = iConnection->GetDataConnection();
-    if ( iDataConnection == 0 )
-        {
-        User::Leave( KErrNoMemory );
-        }
-    User::LeaveIfError( iDataConnection->Open() );
-    User::LeaveIfError( iDataConnection->GetData( &iUiData ) );
-        
-    //Copy the eapol UI data to the temporary data shown on the setting UI
-    iSettingUsername.Copy( iUiData->GetPapUserName() );
-    iSettingPwPrompt = *( iUiData->GetPapPasswordPrompt() );
-    iSettingPassword.Copy( iUiData->GetPapPassword() );    
-
-    #if defined(_DEBUG) || defined(DEBUG)    
-    RDebug::Print(_L("When read from eapol, iSettingUsername = %S"), &iSettingUsername );
-    RDebug::Print(_L("When read from eapol, iSettingPwPrompt = %d"), iSettingPwPrompt );
-    RDebug::Print(_L("When read from eapol, iSettingPassword = %S"), &iSettingPassword );
-    #endif    
-    
-    FeatureManager::InitializeLibL();
-    
-    ConstructL( R_PAP_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it first...
-    CleanupStack::Pop( this );
-    
-    return CAknDialog::ExecuteLD( aResourceId );
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::~CPapUiDialog
-// -----------------------------------------------------------------------------
-//
-CPapUiDialog::~CPapUiDialog()
-    {
-
-    delete iNaviDecorator;
-            
-    if ( iSettingArray )
-        {
-        iSettingArray->Array()->ResetAndDestroy();
-        delete iSettingArray;
-        }
-
-    iSettingListBox = NULL;
-
-    if ( iDataConnection )
-        {
-        iDataConnection->Close();        
-        delete iDataConnection;
-        }
-
-    if ( iConnection )
-        {
-        iConnection->Close();        
-        }
-    
-    delete iPreviousText;
-        
-    FeatureManager::UnInitializeLib();
-    }
-
-
-// ---------------------------------------------------------
-// CPapUiDialog::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CPapUiDialog::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                   TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            OkToExitL( EPapUiCmdChange );         
-            break;
-            }
-
-        case EEventItemActioned:
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            break;
-            };
-        };
-    }    
-
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::PreLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::PreLayoutDynInitL()
-    {
-    ChangeTitleL( ETrue );
-    
-    TUid naviPaneUid;
-    naviPaneUid.iUid = EEikStatusPaneUidNavi;
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( naviPaneUid );
-    if ( subPane.IsPresent()&&subPane.IsAppOwned() )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>( 
-                                        statusPane->ControlL( naviPaneUid ) );
-
-        // Set empty text to hide tabs.
-        iNaviDecorator = iNaviPane->CreateNavigationLabelL( KNullDesC );
-        iNaviPane->PushL( *iNaviDecorator );
-        }           
-
-    
-    // Initialize setting page 
-    iSettingListBox = static_cast<CAknSettingStyleListBox*>( 
-                                    ControlOrNull( EPapSettingsListBox ) );
-    iSettingListBox->SetMopParent( this );
-    iSettingListBox->CreateScrollBarFrameL( ETrue );
-    iSettingListBox->ScrollBarFrame()->SetScrollBarVisibilityL( 
-                                                CEikScrollBarFrame::EOff,
-                                                CEikScrollBarFrame::EAuto );
-    iSettingListBox->SetListBoxObserver( this );
-    DrawSettingsListL();
-
-    iIsUIConstructionCompleted = ETrue;
-
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::ChangeTitleL
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::ChangeTitleL( TBool aIsStarted )
-    {
-    TUid titlePaneUid;
-    titlePaneUid.iUid = EEikStatusPaneUidTitle;
-
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-    CEikStatusPaneBase::TPaneCapabilities subPane = 
-                                statusPane->PaneCapabilities( titlePaneUid );
-    
-    if ( subPane.IsPresent() && subPane.IsAppOwned() )
-        {
-        CAknTitlePane* titlePane = static_cast<CAknTitlePane*>(
-                                        statusPane->ControlL( titlePaneUid) );
-        if ( aIsStarted )
-            {
-            // Store previous application title text
-            const TDesC* prevText = titlePane->Text();    
-            iPreviousText = HBufC::NewL( prevText->Length() );
-            iPreviousText->Des().Append( *prevText );
-            TDesC* titleText = iEikonEnv->AllocReadResourceLC( 
-                                                    R_PAP_SETTINGS_TITLE );
-            titlePane->SetTextL( *titleText );
-            CleanupStack::PopAndDestroy( titleText ); 
-            }
-        else
-            {
-            // Set calling application title text back
-            titlePane->SetTextL( *iPreviousText );    
-            }    
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CPapUiDialog::OkToExitL( TInt aButtonId )
-    {
-    #if defined(_DEBUG) || defined(DEBUG)
-    RDebug::Print(_L("CPapUiDialog::OkToExitL") );
-    #endif   
-    
-    TBool ret( EFalse );
-    switch ( aButtonId )
-        {
-        case EEikBidOk:
-            {
-            if( iIsUIConstructionCompleted )
-                {
-                if ( iSettingListBox->IsFocused() )
-                    {
-                    ShowSettingPageL( EFalse );
-                    }    
-                }
-            else
-                {
-                #if defined(_DEBUG) || defined(DEBUG)
-				RDebug::Print(_L("CPapUiDialog::OkToExitL - UI not ready - Ignoring key press.\n") );
-				#endif
-                }
-                
-            break;
-            }
-
-        case EAknSoftkeyOptions:
-            {
-            DisplayMenuL();
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-            {
-            UpdateEapolData();
-            ChangeTitleL( EFalse );
-            ret = ETrue;
-            break;
-            }
-        
-        case EPapUiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-    			{
-        		ShowSettingPageL( EFalse );
-    			}
-    	    else
-    			{
-    			#if defined(_DEBUG) || defined(DEBUG)
-    			RDebug::Print(_L("CPapUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-    			#endif
-    			}
-
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-
-    if ( ret )
-        {
-        *iButtonId = aButtonId;
-        }
-
-    return ret;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::DrawSettingsListL
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::DrawSettingsListL()
-    {
-    iSettingArray->Array()->ResetAndDestroy();
-    TInt ordinal = 0;
-    
-    // ---------------------------------------------------------------
-    // Username setting item. If the username has never been set,
-    // shows "(not defined)", otherwise shows the username.
-    iSettingArray->AddTextItemL( iSettingUsername,
-                                 EPapSettingPageUserName,
-                                 R_PAP_USERNAME_SETTING_TITLE,
-                                 R_PAP_USERNAME_PAGE,
-                                 NULL,
-                                 ordinal++ );
-                                 
-    // ---------------------------------------------------------------
-    // Password prompt setting item. Radio buttons Prompt/User defined.                                
-    iSettingArray->AddBinarySettingItemL( R_PAP_PASSWORD_POPUP_PAGE,
-                                          R_PAP_PASSWORD_SETTING_TITLE, 
-                                          R_PAP_PASSWORD_PROMPT_CHOICES,
-                                          ordinal++,
-                                          iSettingPwPrompt );
-                                          
-    // ---------------------------------------------------------------
-    // Password setting item. Never visible in the setting list, but the
-    // setting page opens when the user selects "User defined" in the
-    // password prompt setting item.
-    iSettingArray->AddPasswordItemL( iSettingPassword,
-                                 EPapSettingPagePassword,
-                                 R_PAP_PASSWORD_SETTING_TITLE,
-                                 R_PAP_PASSWORD_SETTING_PAGE,
-                                 NULL,
-                                 ordinal++ );
-                                 
-    // Set the last item hidden
-    CAknSettingItem* item = iSettingArray->Array()->At( EPasswordItem );
-    item->SetHidden( ETrue );
-                           
-                                                                                                           
-    iSettingListBox->Model()->SetItemTextArray( iSettingArray->Array() );    
-    iSettingListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-    iSettingArray->Array()->RecalculateVisibleIndicesL();
-    iSettingListBox->HandleItemAdditionL();
-    iSettingListBox->UpdateScrollBarsL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::DynInitMenuPaneL( TInt aResourceId, 
-                                         CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aResourceId == R_PAP_MENU_PANE )
-        {
-        if ( aMenuPane && !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::UpdateEapolData
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::UpdateEapolData()
-    {
-    #if defined(_DEBUG) || defined(DEBUG)
-    RDebug::Print(_L("CPapUiDialog::UpdateEapolData") );    
-    RDebug::Print(_L("Saving username: %S"), &iSettingUsername );
-    RDebug::Print(_L("Saving pwprompt: %d"), iSettingPwPrompt );
-    RDebug::Print(_L("Saving password: %S"), &iSettingPassword );    
-    #endif
-        
-    // username
-    if ( iSettingUsername.Length() )
-        {
-        ( iUiData->GetPapUserName() ).Copy( iSettingUsername );
-        }
-    
-        
-    // pwprompt
-    *( iUiData->GetPapPasswordPrompt() ) = iSettingPwPrompt;
-       
-    // password
-    ( iUiData->GetPapPassword() ).Copy( iSettingPassword );
-        
-    iDataConnection->Update();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::ProcessCommandL( TInt aCommand )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    switch( aCommand )
-        {
-        case EAknCmdExit:
-            {
-            TryExitL( aCommand );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case EPapUiCmdChange:
-            {
-            if( iIsUIConstructionCompleted )
-    			{
-        		ShowSettingPageL( ETrue );
-    			}
-    		else
-    			{
-    		    #if defined(_DEBUG) || defined(DEBUG)
-    			RDebug::Print(_L("CPapUiDialog::ProcessCommandL - UI not ready - Ignoring key press.\n") );
-    			#endif
-    			}
-            break;
-            }
-
-        default:
-            {
-            break;
-            }
-        }
-    }
-    
-    
-// -----------------------------------------------------------------------------
-// CPapUiDialog::ShowSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::ShowSettingPageL( TInt aCalledFromMenu ) 
-    {
-    #if defined(_DEBUG) || defined(DEBUG)
-    RDebug::Print(_L("CPapUiDialog::ShowSettingPageL") );
-    #endif    
-    
-    TInt index = iSettingListBox->CurrentItemIndex();
-    
-    if ( index == EUsernameItem )
-        {
-        ShowUsernameSettingPageL();
-        }
-    
-    else if ( index == EPasswordPromptItem )
-        {
-        // The previous value is needed for comparison,
-        // after the user has done the editing
-        TBool oldChoice = iSettingPwPrompt;
-        
-        // Show the radio button page and let the user edit
-        CAknSettingItem* item = iSettingArray->Array()->At( index );
-        item->EditItemL( aCalledFromMenu );
-        item->StoreL();
-        
-        // Check the new value
-        TBool newChoice = iSettingPwPrompt;
-        
-        // Prompt -> User defined
-        if ( oldChoice && !newChoice )
-            {
-            // Ask to set a password
-            ShowPasswordSettingPageL();
-            
-            // If the password item was cancelled,
-            // or if username was prompted and cancelled,
-            // restore "Prompt" for the password prompt setting
-            if ( iSettingArray->IsPwItemCancelled() || iUsernameCancelled )
-                {
-                // Toggle the setting back to Prompt without showing the page
-                item->EditItemL( EFalse );
-                item->StoreL();
-                }
-            }
-        
-        // User defined -> User defined        
-        else if ( !oldChoice && !newChoice )
-           {
-           // Ask to set a new password
-           ShowPasswordSettingPageL();
-           }
-        
-        // Prompt -> Prompt
-        else if ( oldChoice && newChoice )
-            {
-            // Do nothing
-            }
-
-        // User defined -> Prompt       
-        else if ( !oldChoice && newChoice )
-            {
-            // Remove the password
-            CPapUiPwSettingItem* pwItem =
-                static_cast< CPapUiPwSettingItem* >(
-                    iSettingArray->Array()->At( EPasswordItem ) );
-            pwItem->DeletePasswordL();
-            
-            }
-            
-        else
-            {
-            // It shouldn't be possible to end up here
-            }
-        
-        }
-        
-    else
-        {
-        // shouldn't end up here
-        }                
-
-    DrawNow();
-    }
-    
-// -----------------------------------------------------------------------------
-// CPapUiDialog::ShowUsernameSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::ShowUsernameSettingPageL() 
-    {
-    #if defined(_DEBUG) || defined(DEBUG)
-    RDebug::Print(_L("CPapUiDialog::ShowUsernameSettingPageL") );
-    #endif
-    
-    iUsernameCancelled = EFalse;
-    
-    CAknSettingItem* item = iSettingArray->Array()->At( EUsernameItem );
-    item->EditItemL( EFalse );
-    item->StoreL(); 
-    }
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::ShowPasswordSettingPageL
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::ShowPasswordSettingPageL() 
-    {
-    #if defined(_DEBUG) || defined(DEBUG)
-    RDebug::Print(_L("CPapUiDialog::ShowPasswordSettingPageL") );
-    #endif  
-    
-    CAknSettingItem* item = iSettingArray->Array()->At( EPasswordItem );
-    
-    item->EditItemL( EFalse );
-    item->StoreL();
-    DrawNow();
-
-    // If password is set, then username must also be defined    
-    if ( !iSettingUsername.Length() && !iSettingArray->IsPwItemCancelled() )
-        {
-        // Show an info note about missing username
-        HBufC* message = NULL;
-        message = StringLoader::LoadLC( R_PAP_DEFINE_USERNAME_INFO_NOTE );
- 	    CAknInformationNote* note = new( ELeave ) CAknInformationNote( ETrue );
-        note->ExecuteLD( *message );
-		CleanupStack::PopAndDestroy( message );
-		
-		ShowUsernameSettingPageL();
-		
-		// If the username is still empty, it can only mean that the user has
-		// cancelled the operation -> remove the temporarily accepted password
-		if ( !iSettingUsername.Length() )
-		    {
-		    iUsernameCancelled = ETrue;
-		    // Remove the password
-            CPapUiPwSettingItem* pwItem =
-                static_cast< CPapUiPwSettingItem* >(
-                    iSettingArray->Array()->At( EPasswordItem ) );
-            pwItem->DeletePasswordL();
-		    }
-        }
-    
-    }
-
-// -----------------------------------------------------------------------------
-// CPapUiDialog::GetHelpContext
-// -----------------------------------------------------------------------------
-//
-void CPapUiDialog::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/data/papnotifdlgui.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Resource file of PapNotifDlg
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-// RESOURCE IDENTIFIER
-NAME PAPN
-
-
-// INCLUDES
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.hrh>
-#include <avkon.loc>
-
-#include <papnotifdlg.loc>
-#include "papnotifui.hrh"
-
-
-// RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE DIALOG r_papnotif_username_password_query
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar | 
-            EEikDialogFlagCbaButtons|EEikDialogFlagNotifyEsc;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtMultilineQuery;
-            id = EMultilineFirstLine;
-            control = AVERELL_DATA_QUERY
-                { 
-                layout = EMultiDataFirstEdwin;
-                label = qtn_wlan_eap_pap_notif_username;
-                control = EDWIN
-                    {
-                    flags = 0;
-                    width = 5;
-                    lines = 1;
-                    maxlength = KPapUsernameMaxLength;
-                    default_case = EAknEditorLowerCase;
-                    allowed_case_modes = EAknEditorAllCaseModes;
-                    allowed_input_modes = EAknEditorAlphaInputMode | 
-                                          EAknEditorNumericInputMode |
-                                          EAknEditorPredictiveInputMode;
-                    default_input_mode = EAknEditorPredictiveInputMode;
-                    };
-                };
-            },
-
-        DLG_LINE
-            {
-            type = EAknCtMultilineQuery;
-            id = EMultilineSecondLine;
-            control = AVERELL_DATA_QUERY 
-                { 
-                layout = EMultiDataSecondSecEd;
-                label = qtn_wlan_eap_pap_notif_password;
-                control = SECRETED
-                    {
-                    num_letters = KPapPasswordMaxLength;
-                    };
-                };
-            }
-        };
-    }
-    
-RESOURCE CBA r_papnotif_softkeys_ok___select
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = text_softkey_ok; },
-        CBA_BUTTON { },
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = qtn_msk_select; }
-        };
-    }
-    
-    
-RESOURCE DIALOG r_pap_challenge_message_query
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar | 
-            EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-    buttons = r_papnotif_softkeys_ok___select;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_wlan_eap_pap_notif_message;
-                };
-            },
-
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                };
-            }
-        };
-    }
-    
-RESOURCE DIALOG r_pap_challenge_reply_query
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar | 
-            EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control= AVKON_DATA_QUERY
-                { 
-                layout = ECodeLayout;
-                label = qtn_wlan_eap_pap_notif_response;
-                control = SECRETED 
-                    {
-                    num_letters = KPapPasswordMaxLength;
-                    };
-                };
-            }
-        };
-    }
-         
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papauthdialog.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of authentication query dialog class of PapNotifDialog.
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-#ifndef __PAPAUTHDIALOG_H__
-#define __PAPAUTHDIALOG_H__
-
-// INCLUDES
-#include <eikdialg.h>
-#include <badesca.h>
-#include <e32cons.h>
-#include <AknForm.h>
-#include <AknQueryDialog.h>
-#include "papnotifdlgplugin.h"
-
-
-// CLASS DECLARATION
-
-/**
-*/
-class CPapAuthDialog : public CAknMultiLineDataQueryDialog
-    {
-    protected:
-        CPapAuthDialog( CPapNotifDialogPlugin* aPlugin );
-        void ConstructL();
-
-    public:
-        static CPapAuthDialog* NewL( TDes& aUsername, TDes& aPassword, 
-                                      CPapNotifDialogPlugin* aPlugin );
-        ~CPapAuthDialog();
-
-    private:
-        virtual TBool OkToExitL( TInt aButtonId );
-        void HandleResourceChange( TInt aType );
-        
-    private:
-        CPapNotifDialogPlugin* iPlugin;     // Pointer to the notifier plugin
-
-    };
-
-#endif  // __PAPAUTHDIALOG_H__
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papchallengemsgdialog.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of PAP Challenge Message Display Dialog
-*
-*/
-
-/*
-* %version: 5 %
-*/
-
-#ifndef __PAPCHALLENGEMSGDIALOG_H__
-#define __PAPCHALLENGEMSGDIALOG_H__
-
-// INCLUDES
-#include <aknmessagequerydialog.h>
-
-
-class CPapChallengeMsgDialog : public CAknMessageQueryDialog
-    {
-    public:
-        static CPapChallengeMsgDialog* NewL( const TDesC& aMessage, 
-                                               CPapNotifDialogPlugin* aPlugin );
-        ~CPapChallengeMsgDialog();
-  
-    private:
-        CPapChallengeMsgDialog( CPapNotifDialogPlugin* aPlugin );
-
-        virtual TBool OkToExitL( TInt aButtonId );
-        void HandleResourceChange( TInt aType );
-        
-    private:
-        CPapNotifDialogPlugin* iPlugin;     // Pointer to the notifier plugin
-    };
-
-#endif  // __PAPCHALLENGEMSGDIALOG_H__
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papchallengereplydialog.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of PAP Challenge Reply Dialog
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-#ifndef __PAPCHALLENGEREPLYDIALOG_H__
-#define __PAPCHALLENGEREPLYDIALOG_H__
-
-// INCLUDES
-#include <AknQueryDialog.h>
-
-
-class CPapChallengeReplyDialog : public CAknTextQueryDialog
-    {
-    public:
-        static CPapChallengeReplyDialog* NewL( TDes& aResponse, 
-                                              CPapNotifDialogPlugin* aPlugin );
-        ~CPapChallengeReplyDialog();
-  
-    private:
-        CPapChallengeReplyDialog( TDes& aResponse,
-                                    CPapNotifDialogPlugin* aPlugin );
-
-        virtual TBool OkToExitL( TInt aButtonId );
-        void HandleResourceChange( TInt aType );
-        
-    private:
-        CPapNotifDialogPlugin* iPlugin;     // Pointer to the notifier plugin
-    };
-
-
-#endif  // __PAPCHALLENGEREPLYDIALOG_H__
-
-// End of File
\ No newline at end of file
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papnotifdlgplugin.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of PAP Notif Dialog Plugin
-*
-*/
-
-/*
-* %version: 7 %
-*/
-
-#ifndef __PAPNOTIFDLGPLUGIN_H__
-#define __PAPNOTIFDLGPLUGIN_H__
-
-
-// INCLUDES
-#include <eikdialg.h>
-#include <e32std.h>
-#include <e32base.h>
-#include <cdblen.h>
-#include <eiknotapi.h>
-#include <AknForm.h>
-#include <AknQueryDialog.h>
-#include <aknPopup.h>
-#include <EapTtlsPapNotifierStruct.h>
-
-
-// CONSTANTS
-
-// UIDs for dialogs
-
-// ID of PAP username & password dialog
-const TUid KUidPapDialog   = { 0x200159A9 };  
-
-// Channel used for screen 
-const TUid KScreenOutputChannel = { 0x00000123 };  
-
-// Number of dialogs in this plugin
-const TInt KPluginGranularity   = 1;
-
-// ROM folder
-_LIT( KDriveZ, "z:" );
-
-// RSC file name.
-_LIT( KResourceFileName, "papnotifdlgui.rsc" );
-
-
-// GLOBAL FUNCTIONS
-
-/**
-* Array of connection dialog plugins.
-* @return A CArray of MEikSrvNotifierBase2 based classes.
-*/
-IMPORT_C CArrayPtr< MEikSrvNotifierBase2 >* NotifierArray();
-
-
-// CLASS DECLARATION
-
-class CPapAuthDialog;
-class CPapChallengeMsgDialog;
-class CPapChallengeReplyDialog;
-
-/**
- * PAP notifier dialog plugin class
- */
-class CPapNotifDialogPlugin : public CBase,
-                              public MEikSrvNotifierBase2
-    {
-    public:
-        static CPapNotifDialogPlugin* NewL();
-
-        ~CPapNotifDialogPlugin();
-
-        TNotifierInfo RegisterL();
-        TNotifierInfo Info() const;
-
-        TPtrC8 StartL( const TDesC8& aBuffer );
-        void StartL( const TDesC8& aBuffer, TInt aReplySlot,
-                     const RMessagePtr2& aMessage );
-
-        TPtrC8 UpdateL( const TDesC8& aBuffer );
-        void Cancel();
-        void CompleteL( TInt aStatus );
-        void Release();
-        
-    public: // new
-        
-        TDes& Username();
-        TDes& Password();
-
-        void SetAuthDlgDismissed();
-        void SetChallengeMsgDismissed();
-        void SetChallengeReplyDismissed();
-
-    protected:
-        CPapNotifDialogPlugin();
-
-        void ConstructL();
-
-    protected:
-        TNotifierInfo iInfo;        // Notifier info
-        RMessagePtr2 iMessage;      // Message
-        TInt iReplySlot;            // Reply slot
-        TBool iCancelled;           // ETrue if dialog cancelled
-
-    private:
-    
-        TInt iResource;             // Resource
-        
-        TPapUiNotifierInfo* iDataPtr;
-        TPckg<TPapUiNotifierInfo>* iDataPckgPtr;        
-            
-        CPapAuthDialog* iPapAuthDialog;
-        CPapChallengeMsgDialog* iPapChallengeMsgDialog;
-        CPapChallengeReplyDialog*iPapChallengeReplyDialog;
-
-        TUint iChallengeSize;
-
-        TBool iAuthDlgDismissed;
-        TBool iChallengeMsgDismissed;
-        TBool iChallengeReplyDismissed;		
-
-    };
-
-
-#endif  // __PAPNOTIFDLGPLUGIN_H__
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/inc/papnotifui.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: PAP Notifier UI hrh file
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef _PAPNOTIFUI_HRH_
-#define _PAPNOTIFUI_HRH_
-
-#define KPapUsernameMaxLength 253
-#define KPapPasswordMaxLength 128
-
-
-	
-#endif  //_PAPNOTIFUI_HRH_
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/loc/papnotifdlg.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: UI strings for WLAN PAP Notifier
-*
-*/
-
-/*
-* %version: %
-*/
-
-//  LOCALISATION STRINGS
-
-
-//d:Username query string.
-//l:popup_query_data_code_window_t4/opt2
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_pap_notif_username    "PAP user name:"
-
-
-//d:Password query string.
-//l:popup_query_data_code_window_t4/opt2
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_pap_notif_password    "Password:"
-
-//d:Message query string for PAP challenge/response.
-//l:heading_pane_t1
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_pap_notif_message    "PAP challenge:"
-
-//d:User reply query string for PAP challenge/response.
-//l:popup_query_data_window_t3/opt2
-//w:
-//r:5.0.1
-//
-#define qtn_wlan_eap_pap_notif_response    "PAP reply:"
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/src/papauthdialog.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of authentication query dialog class of Pap Notifier
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-// INCLUDE FILES
-#include <papnotifdlgui.rsg>
-#include "papnotifdlgplugin.h"
-#include "papauthdialog.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CPapAuthDialog::CPapAuthDialog
-// -----------------------------------------------------------------------------
-//
-CPapAuthDialog::CPapAuthDialog( CPapNotifDialogPlugin* aPlugin )
-    : CAknMultiLineDataQueryDialog( ENoTone ), 
-    iPlugin( aPlugin )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapAuthDialog::NewL
-// -----------------------------------------------------------------------------
-//
-CPapAuthDialog* CPapAuthDialog::NewL( TDes& aUsername, TDes& aPassword,
-                                        CPapNotifDialogPlugin* aPlugin )
-    {
-    CPapAuthDialog* self = new( ELeave ) CPapAuthDialog( aPlugin );
-    CleanupStack::PushL( self );
-    if ( aUsername.Length() )
-        {
-        self->SetDataL( aUsername, aPassword );
-        }
-
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapAuthDialog::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CPapAuthDialog::ConstructL()
-    {
-    #if defined( _DEBUG ) || defined( DEBUG )
-        RDebug::Print(_L("CPapAuthDialog::ConstructL") );
-    #endif
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapAuthDialog::~CPapAuthDialog
-// -----------------------------------------------------------------------------
-//
-CPapAuthDialog::~CPapAuthDialog()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapAuthDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CPapAuthDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( CAknMultiLineDataQueryDialog::OkToExitL( aButtonId ) )
-        {
-        if ( aButtonId == EAknSoftkeyOk )
-            {
-            #if defined( _DEBUG ) || defined( DEBUG )
-                RDebug::Print(_L("CPapAuthDialog::OkToExitL, softkey OK") );
-            #endif
-            
-            // save the user entries to be sent back to eapol
-            CAknMultilineQueryControl* firstControl = FirstControl();
-            firstControl->GetText( iPlugin->Username() );
-
-            CAknMultilineQueryControl* secondControl = SecondControl();
-            secondControl->GetText( iPlugin->Password() );            
-            
-            iPlugin->SetAuthDlgDismissed();             
-            iPlugin->CompleteL( KErrNone );
-            return( ETrue );
-            }
-        else
-            {
-            #if defined( _DEBUG ) || defined( DEBUG )
-                RDebug::Print(_L("CPapAuthDialog::OkToExitL, softkey Cancel") );
-            #endif
-            
-            iPlugin->SetAuthDlgDismissed();
-            iPlugin->CompleteL( KErrCancel );
-            return( ETrue );
-            }
-        }
-
-    return( EFalse );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapAuthDialog::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CPapAuthDialog::HandleResourceChange( TInt aType )
-    {
-    CAknMultiLineDataQueryDialog::HandleResourceChange( aType );
-
-    if ( aType == KAknsMessageSkinChange )
-        {
-        }
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/src/papchallengemsgdialog.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PAP Challenge Message Display Dialog
-*
-*/
-
-/*
-* %version: 7 %
-*/
-
-// INCLUDE FILES
-#include "papnotifdlgplugin.h"
-#include "papchallengemsgdialog.h"
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeMsgDialog::CPapChallengeMsgDialog
-// -----------------------------------------------------------------------------
-//
-CPapChallengeMsgDialog::CPapChallengeMsgDialog( CPapNotifDialogPlugin* aPlugin )
-: CAknMessageQueryDialog( ENoTone ), 
-  iPlugin( aPlugin )
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeMsgDialog::~CPapChallengeMsgDialog
-// -----------------------------------------------------------------------------
-//
-CPapChallengeMsgDialog::~CPapChallengeMsgDialog()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeMsgDialog::NewL
-// -----------------------------------------------------------------------------
-//
-CPapChallengeMsgDialog* CPapChallengeMsgDialog::NewL( const TDesC& aMessage, 
-                                                    CPapNotifDialogPlugin* aPlugin )
-    {
-    CPapChallengeMsgDialog* self = new( ELeave ) CPapChallengeMsgDialog( aPlugin );
-
-    CleanupStack::PushL( self );
-    if ( aMessage.Length() )
-        {
-        self->SetMessageTextL( aMessage );
-        }
-
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeMsgDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CPapChallengeMsgDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( CAknMessageQueryDialog::OkToExitL( aButtonId ) )
-        {
-        if ( aButtonId == EAknSoftkeyOk )
-            {
-            #if defined( _DEBUG ) || defined( DEBUG )
-                RDebug::Print(_L("CPapChallengeMsgDialog::OkToExitL, softkey OK") );
-            #endif
-            iPlugin->SetChallengeMsgDismissed();
-            iPlugin->CompleteL( KErrNone );
-            }
-        else
-            {
-            #if defined( _DEBUG ) || defined( DEBUG )
-                RDebug::Print(_L("CPapChallengeMsgDialog::OkToExitL, softkey Cancel") );
-            #endif
-            // Some cancel.
-            iPlugin->SetChallengeMsgDismissed();
-            iPlugin->CompleteL( KErrCancel );
-            }
-
-        return( ETrue );
-        }
-
-    return( EFalse ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeMsgDialog::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CPapChallengeMsgDialog::HandleResourceChange( TInt aType )
-    {
-    CAknMessageQueryDialog::HandleResourceChange( aType );
-    if ( aType == KAknsMessageSkinChange )
-        {
-        }
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/src/papchallengereplydialog.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PAP Challenge Reply Dialog
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-// INCLUDE FILES
-#include "papnotifdlgplugin.h"
-#include "papchallengereplydialog.h"
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeReplyDialog::CPapChallengeReplyDialog
-// -----------------------------------------------------------------------------
-//
-CPapChallengeReplyDialog::CPapChallengeReplyDialog( TDes& aResponse, 
-                                                  CPapNotifDialogPlugin* aPlugin )
-: CAknTextQueryDialog( aResponse ), 
-  iPlugin( aPlugin )
-    {    
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeReplyDialog::~CPapChallengeReplyDialog
-// -----------------------------------------------------------------------------
-//
-CPapChallengeReplyDialog::~CPapChallengeReplyDialog()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeReplyDialog::NewL
-// -----------------------------------------------------------------------------
-//
-CPapChallengeReplyDialog* CPapChallengeReplyDialog::NewL( TDes& aResponse, 
-                                                    CPapNotifDialogPlugin* aPlugin )
-    {
-    CPapChallengeReplyDialog* self = new( ELeave ) CPapChallengeReplyDialog( 
-                                                        aResponse, aPlugin );
-    return self;
-}
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeReplyDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CPapChallengeReplyDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( CAknTextQueryDialog::OkToExitL( aButtonId ) )
-       {
-        if ( aButtonId==EAknSoftkeyOk )
-            {
-            iPlugin->SetChallengeReplyDismissed();
-            iPlugin->CompleteL( KErrNone );
-            }
-        else
-            {
-            // Everything else is for cancel.
-            iPlugin->SetChallengeReplyDismissed();
-            iPlugin->CompleteL( KErrCancel );
-            }
-
-        return( ETrue );
-        }
-
-    return( EFalse ); 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapChallengeReplyDialog::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CPapChallengeReplyDialog::HandleResourceChange( TInt aType )
-    {
-    CAknTextQueryDialog::HandleResourceChange( aType );
-    if ( aType == KAknsMessageSkinChange )
-        {
-        }
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/pap/notifierui/src/papnotifdlgplugin.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,489 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of PapNotifDlg dialog plugin.
-*
-*/
-
-/*
-* %version: 9 %
-*/
-
-// INCLUDE FILES
-#include <coemain.h>
-#include <eikenv.h>
-#include <bautils.h>
-#include <data_caging_path_literals.hrh>
-#include <papnotifdlgui.rsg>
-
-#include <e32property.h>		// For RProperty 
-#include <UikonInternalPSKeys.h> // For KPSUidUikon and KUikGlobalNotesAllowed.
-
-#include <EapTtlsPapNotifierStruct.h>
-#include "papnotifdlgplugin.h"
-#include "papauthdialog.h"
-#include "papchallengemsgdialog.h"
-#include "papchallengereplydialog.h"
-
-// CONSTANTS
-//static const TUint KUtf8UnicodeRatio = 2;
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-
-// -----------------------------------------------------------------------------
-// CreateNotifiersL
-// -----------------------------------------------------------------------------
-//
-LOCAL_C void CreateNotifiersL( CArrayPtrFlat< MEikSrvNotifierBase2 >* aNotifiers )
-    {
-    MEikSrvNotifierBase2 *serNotify;
-    serNotify = CPapNotifDialogPlugin::NewL();
-    CleanupStack::PushL( serNotify );
-    aNotifiers->AppendL( serNotify );
-    CleanupStack::Pop( serNotify );
-    }
-
-
-// -----------------------------------------------------------------------------
-// NotifierArray
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CArrayPtr< MEikSrvNotifierBase2 >* NotifierArray()
-    {
-    // NotifierArray() can't leave
-    CArrayPtrFlat< MEikSrvNotifierBase2 >* array = 
-                new CArrayPtrFlat< MEikSrvNotifierBase2 >( KPluginGranularity );
-
-    if ( array )
-        {
-        TRAPD( err, CreateNotifiersL( array ) );
-        
-        if( err )
-            {
-            TInt count = array->Count();
-
-            while( count-- )
-                {
-                ( *array )[ count ]->Release();
-                }
-
-            delete array;
-            array = NULL;
-            }
-        }
-
-    return( array );
-    }
-
-
-//////////////////////////////////////////////////////////////
-// PAP dialog plugin
-/////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::CPapNotifDialogPlugin
-// -----------------------------------------------------------------------------
-//
-CPapNotifDialogPlugin::CPapNotifDialogPlugin()
-: iCancelled( EFalse ),
-  iAuthDlgDismissed( EFalse ),
-  iChallengeMsgDismissed( EFalse ),
-  iChallengeReplyDismissed( EFalse )
-    {
-    iManager = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::~CPapNotifDialogPlugin
-// -----------------------------------------------------------------------------
-//
-CPapNotifDialogPlugin::~CPapNotifDialogPlugin()
-    {
-    CCoeEnv::Static()->DeleteResourceFile( iResource );
-
-    if ( !iAuthDlgDismissed )
-        {
-        delete iPapAuthDialog;
-        }
-
-    if ( !iChallengeMsgDismissed )
-        {
-        delete iPapChallengeMsgDialog;
-        }
-
-    if ( !iChallengeReplyDismissed )
-        {
-        delete iPapChallengeReplyDialog;
-        }
-
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::RegisterL
-// -----------------------------------------------------------------------------
-//
-CPapNotifDialogPlugin::TNotifierInfo CPapNotifDialogPlugin::RegisterL()
-    {
-    iInfo.iUid      = KUidPapDialog;
-    iInfo.iPriority = ENotifierPriorityHigh;
-    iInfo.iChannel  = KUidPapDialog;
-    return iInfo;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::NewL
-// -----------------------------------------------------------------------------
-//
-CPapNotifDialogPlugin* CPapNotifDialogPlugin::NewL()
-    {
-    CPapNotifDialogPlugin* self = new( ELeave ) CPapNotifDialogPlugin();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CPapNotifDialogPlugin::ConstructL()
-    {
-    #if defined( _DEBUG ) || defined( DEBUG )
-        RDebug::Print(_L("CPapNotifDialogPlugin::ConstructL") );
-    #endif
-    
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );   
-    fileName.Append( KResourceFileName );
-
-    BaflUtils::NearestLanguageFile( CCoeEnv::Static()->FsSession(), fileName );
-    iResource = CCoeEnv::Static()->AddResourceFileL( fileName );
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::StartL
-// -----------------------------------------------------------------------------
-//
-TPtrC8 CPapNotifDialogPlugin::StartL( const TDesC8& /*aBuffer*/ )
-    {
-    return KNullDesC8().Ptr();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::StartL
-// -----------------------------------------------------------------------------
-//
-void CPapNotifDialogPlugin::StartL( const TDesC8& aBuffer, 
-                                    TInt aReplySlot, 
-                                    const RMessagePtr2& aMessage )
-    {
-    #if defined( _DEBUG ) || defined( DEBUG )
-        RDebug::Print(_L("CPapNotifDialogPlugin::StartL") );
-    #endif
-    
-    iCancelled = EFalse;
-    iReplySlot = aReplySlot;
-    iMessage   = aMessage;
-     
-    // This object gets constructed only once but
-    // can get called many times. 
-    // So initialize everything here.
-    iAuthDlgDismissed = EFalse;
-    iChallengeMsgDismissed = EFalse;
-    iChallengeReplyDismissed = EFalse;
-    iPapAuthDialog = NULL;
-    iPapChallengeMsgDialog = NULL;
-    iPapChallengeReplyDialog = NULL;
-    iDataPtr = NULL;
-    iDataPckgPtr = NULL;
-    
-    // We are about to display the password prompt.
-    // Since this part of the code can be executed during the bootup, check if 
-    // the UI has really started up to display notes/dialogs.
-    TInt notesAllowed = 0;
-    TInt error = RProperty::Get( KPSUidUikon, KUikGlobalNotesAllowed, 
-                                 notesAllowed );
-
-    // The above call can return error. Ignore the error. What we care is 
-    // if notesAllowed has turned to 1 from 0.
-    if ( notesAllowed )
-        {    
-        iDataPtr = new( ELeave ) TPapUiNotifierInfo; 
-        iDataPckgPtr = new( ELeave ) TPckg<TPapUiNotifierInfo>( *iDataPtr );
-        iDataPckgPtr->Copy( aBuffer );
-        
-        #if defined( _DEBUG ) || defined( DEBUG )
-            RDebug::Print(_L("CPapNotifDialogPlugin::StartL, state = %d"), iDataPtr->iState );
-        #endif
-        
-        switch ( iDataPtr->iState )
-            {
-            case TPapUiNotifierInfo::EPapUiNotifierAuthQueryDialog:
-                {
-                iPapAuthDialog = CPapAuthDialog::NewL(
-                                        iDataPtr->iUsrPwdInfo.iUserName, 
-                                        iDataPtr->iUsrPwdInfo.iPassword,
-                                        this );
-                                        
-                #if defined( _DEBUG ) || defined( DEBUG )                                        
-                    RDebug::Print(_L("CPapNotifDialogPlugin::StartL, executing auth dialog") );
-                #endif
-                                                    
-                iPapAuthDialog->ExecuteLD( R_PAPNOTIF_USERNAME_PASSWORD_QUERY );
-                
-                #if defined( _DEBUG ) || defined( DEBUG )
-                    RDebug::Print(_L("CPapNotifDialogPlugin::StartL, auth dialog executed") );
-                #endif
-                
-                break;
-                }
-                
-            case TPapUiNotifierInfo::EPapUiNotifierPapChallengeSize:
-                {
-                iChallengeSize = iDataPtr->iSrvChallengeSize;
-                break;
-                }
-
-            case TPapUiNotifierInfo::EPapUiNotifierPapChallengeMsgDialog:
-                {
-                #if defined( _DEBUG ) || defined( DEBUG )
-                    RDebug::Print(_L("CPapNotifDialogPlugin::StartL, chal msg dialog start") );
-                #endif
-    
-                HBufC16* challengetext = HBufC16::NewLC( KMaxPapChallengeLength );
-                TPtr16 text = challengetext->Des();                
-                text.Copy( iDataPtr->iPapChallenge ); 
-
-                #if defined( _DEBUG ) || defined( DEBUG )
-                    RDebug::Print(_L("CPapNotifDialogPlugin::StartL, create chal msg dialog") );
-                #endif
-    
-                iPapChallengeMsgDialog = CPapChallengeMsgDialog::NewL( text,
-                    this );
-                #if defined( _DEBUG ) || defined( DEBUG )
-                    RDebug::Print(_L("CPapNotifDialogPlugin::StartL, executing chal msg dialog") );
-                #endif
-                    
-                iPapChallengeMsgDialog->ExecuteLD( R_PAP_CHALLENGE_MESSAGE_QUERY );
-                #if defined( _DEBUG ) || defined( DEBUG )
-                    RDebug::Print(_L("CPapNotifDialogPlugin::StartL, chal msg dialog executed") );
-                #endif
-
-                CleanupStack::PopAndDestroy( challengetext );
-                
-                break;
-                }
-
-            case TPapUiNotifierInfo::EPapUiNotifierPapChallengeReplyQueryDialog:
-                {
-                // construct and show the challenge reply dialog,
-                // save the reply in the password field                       
-                iPapChallengeReplyDialog = CPapChallengeReplyDialog::NewL(
-                    iDataPtr->iUsrPwdInfo.iPassword, this );
-                iPapChallengeReplyDialog->ExecuteLD( R_PAP_CHALLENGE_REPLY_QUERY);
-    
-                break;
-                }
-
-            default:
-                {
-                break;
-                }
-                                
-            }
-    
-        } 
-
-    // In case if the notes are not allowed, this message gets completed when
-    // EAPOL time out occurs and a subsequent call to cancel
-    }
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::UpdateL
-// -----------------------------------------------------------------------------
-//
-TPtrC8 CPapNotifDialogPlugin::UpdateL( const TDesC8& /*aBuffer*/ )
-    {
-    return KNullDesC8().Ptr();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::Cancel
-// -----------------------------------------------------------------------------
-//
-void CPapNotifDialogPlugin::Cancel()
-    {
-    #if defined( _DEBUG ) || defined( DEBUG )
-        RDebug::Print(_L("CPapNotifDialogPlugin::Cancel") );
-    #endif
-    
-    if ( !iCancelled )
-        {
-        iCancelled = ETrue;
-        
-        if ( !iMessage.IsNull() )
-            {
-            iMessage.Complete( KErrCancel );
-            }
-
-        if ( !iAuthDlgDismissed && iPapAuthDialog )
-            {
-            iAuthDlgDismissed = ETrue;
-            delete iPapAuthDialog;
-            iPapAuthDialog = NULL;
-            }
-            
-        if ( !iChallengeMsgDismissed && iPapChallengeMsgDialog )
-            {
-            iChallengeMsgDismissed = ETrue;
-            delete iPapChallengeMsgDialog;
-            iPapChallengeMsgDialog = NULL;
-            }
-            
-        if ( !iChallengeReplyDismissed && iPapChallengeReplyDialog )
-            {
-            iChallengeReplyDismissed = ETrue;
-            delete iPapChallengeReplyDialog;
-            iPapChallengeReplyDialog = NULL;
-            }            
-        
-        }
-
-    if ( iDataPtr )
-        {
-        delete iDataPtr;
-        iDataPtr = NULL;
-        }
-
-    if ( iDataPckgPtr )
-        {
-        delete iDataPckgPtr;
-        iDataPckgPtr = NULL;
-        } 
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::CompleteL
-// -----------------------------------------------------------------------------
-//
-void CPapNotifDialogPlugin::CompleteL( TInt aStatus )
-    {
-    #if defined( _DEBUG ) || defined( DEBUG )
-        RDebug::Print(_L("CPapNotifDialogPlugin::CompleteL") );
-    #endif
-    
-    if ( aStatus == KErrNone && !iMessage.IsNull() )
-        {
-        iMessage.WriteL( iReplySlot, *iDataPckgPtr );
-        }
-        
-    iCancelled = ETrue;
-    
-    if ( !iMessage.IsNull() )
-        {
-        iMessage.Complete( aStatus );
-        }
-
-    if ( iDataPtr ) 
-        {
-        delete iDataPtr;
-        iDataPtr = NULL;		
-        }
-
-    if ( iDataPckgPtr )
-        {
-        delete iDataPckgPtr;
-        iDataPckgPtr = NULL;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::Release
-// -----------------------------------------------------------------------------
-//
-void CPapNotifDialogPlugin::Release()
-    {
-    delete this;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::Info
-// -----------------------------------------------------------------------------
-//
-CPapNotifDialogPlugin::TNotifierInfo CPapNotifDialogPlugin::Info() const
-    {
-    return iInfo;
-    }
-    
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::Username
-// -----------------------------------------------------------------------------
-//
-TDes& CPapNotifDialogPlugin::Username()
-    {
-    return ( iDataPtr->iUsrPwdInfo.iUserName ) ;
-    }
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::Password
-// -----------------------------------------------------------------------------
-//
-TDes& CPapNotifDialogPlugin::Password()
-    {
-    return ( iDataPtr->iUsrPwdInfo.iPassword ) ;
-    }
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::SetAuthDlgDismissed
-// -----------------------------------------------------------------------------
-//
-void CPapNotifDialogPlugin::SetAuthDlgDismissed()
-    {
-    iAuthDlgDismissed = ETrue;
-    }
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::SetChallengeMsgDismissed
-// -----------------------------------------------------------------------------
-//
-void CPapNotifDialogPlugin::SetChallengeMsgDismissed()
-    {
-    iChallengeMsgDismissed = ETrue;
-    }
-
-// -----------------------------------------------------------------------------
-// CPapNotifDialogPlugin::SetChallengeReplyDismissed
-// -----------------------------------------------------------------------------
-//
-void CPapNotifDialogPlugin::SetChallengeReplyDismissed()
-    {
-    iChallengeReplyDismissed = ETrue;
-    }
-
-
-
-// End of File
--- a/wlansecuritysettings/wlaneapsettingsui/rom/WlanEapSettingsUi.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for project WLAN EAP Settings UI
-*
-*/
-
-/*
-* %version: 11.1.10 %
-*/
-
-#ifndef __WLANEAPSETTINGSUI_IBY__
-#define __WLANEAPSETTINGSUI_IBY__
-
-#include <bldvariant.hrh>
-
-#ifdef __PROTOCOL_WLAN
-
-ECOM_PLUGIN( eapnotifwrapper.dll,2000cf2e.rsc )
-
-#ifdef FF_WLAN_EXTENSIONS
-file=ABI_DIR\BUILD_DIR\leapnotifdlg.dll     SHARED_LIB_DIR\leapnotifdlg.dll
-ECOM_PLUGIN( eapfastnotifdlg.dll,200100a5.rsc )
-#endif // FF_WLAN_EXTENSIONS
-
-file=ABI_DIR\BUILD_DIR\mschapv2notifdlg.dll     SHARED_LIB_DIR\mschapv2notifdlg.dll
-file=ABI_DIR\BUILD_DIR\gtcnotifdlg.dll     SHARED_LIB_DIR\gtcnotifdlg.dll
-
-file=ABI_DIR\BUILD_DIR\papnotifdlg.dll     SHARED_LIB_DIR\papnotifdlg.dll
-
-ECOM_PLUGIN( EapPluginConfig.dll,102072bb.rsc )
-
-#endif // __PROTOCOL_WLAN
-
-#endif // __WLANEAPSETTINGSUI_IBY__
-
-//  End of File
--- a/wlansecuritysettings/wlaneapsettingsui/rom/WlanEapSettingsUiResources.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for project WlanEapSettingsUi
-*
-*/
-
-/*
-* %version: tr1cfwln#18 %
-*/
-
-#ifndef __WLANEAPSETTINGSUIRESOURCES_IBY__
-#define __WLANEAPSETTINGSUIRESOURCES_IBY__
-
-#include <bldvariant.hrh>
-
-#ifdef __PROTOCOL_WLAN
-
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapSimUi.rsc            RESOURCE_FILES_DIR\EapSimUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapAkaUi.rsc            RESOURCE_FILES_DIR\EapAkaUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapMschapv2Ui.rsc       RESOURCE_FILES_DIR\EapMschapv2Ui.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapTlsUi.rsc            RESOURCE_FILES_DIR\EapTlsUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapPeapUi.rsc           RESOURCE_FILES_DIR\EapPeapUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapTtlsUi.rsc           RESOURCE_FILES_DIR\EapTtlsUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapGtcUi.rsc            RESOURCE_FILES_DIR\EapGtcUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\papui.rsc               RESOURCE_FILES_DIR\papui.rsc
-
-#ifdef FF_WLAN_EXTENSIONS
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapLeapUi.rsc           RESOURCE_FILES_DIR\EapLeapUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\LeapNotifDlgUi.rsc      RESOURCE_FILES_DIR\LeapNotifDlgUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\eapfastui.rsc           RESOURCE_FILES_DIR\eapfastui.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\eapfastnotifdlgui.rsc   RESOURCE_FILES_DIR\eapfastnotifdlgui.rsc
-#endif // FF_WLAN_EXTENSIONS
-
-DATA=DATAZ_\RESOURCE_FILES_DIR\MsChapv2NotifDlgUi.rsc  RESOURCE_FILES_DIR\MsChapv2NotifDlgUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\GtcNotifDlgUi.rsc       RESOURCE_FILES_DIR\GtcNotifDlgUi.rsc
-DATA=DATAZ_\RESOURCE_FILES_DIR\papnotifdlgui.rsc       RESOURCE_FILES_DIR\papnotifdlgui.rsc
-
-// For the EAPPluginConfig module
-DATA=DATAZ_\RESOURCE_FILES_DIR\EapPluginConfigRes.rsc  RESOURCE_FILES_DIR\EapPluginConfigRes.rsc
-
-#endif // __PROTOCOL_WLAN
-
-#endif // __WLANEAPSETTINGSUIRESOURCES_IBY__
-
-//  End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/Rom/WPASecuritySettingsUI.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for project WPASecuritySettingsUI
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#ifndef __WPASECURITYSETTINGSUI_IBY__
-#define __WPASECURITYSETTINGSUI_IBY__
-
-#ifdef __PROTOCOL_WLAN
-FILE=ABI_DIR\BUILD_DIR\WPASecuritySettingsUI.dll    SHARED_LIB_DIR\WPASecuritySettingsUI.dll
-#else
-// stub for non-WLAN products
-FILE=ABI_DIR\BUILD_DIR\wpasecuritysettingsuistub.dll    SHARED_LIB_DIR\WPASecuritySettingsUI.dll
-#endif // __PROTOCOL_WLAN
-
-#endif
--- a/wlansecuritysettings/wpasecuritysettingsui/Rom/WPASecuritySettingsUIResources.iby	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Image description file for project WPASecuritySettingsUI
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-#ifndef __WPASECURITYSETTINGSUIRESOURCES_IBY__
-#define __WPASECURITYSETTINGSUIRESOURCES_IBY__
-
-#ifdef __PROTOCOL_WLAN
-
-DATA=DATAZ_\RESOURCE_FILES_DIR\WPASecuritySettingsUI.rsc	RESOURCE_FILES_DIR\WPASecuritySettingsUI.rsc
-
-#endif // __PROTOCOL_WLAN
-
-#endif
\ No newline at end of file
--- a/wlansecuritysettings/wpasecuritysettingsui/bwinscw/WPASecuritySettingsUI_EKA2_ALRu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-EXPORTS
-	??1CWPASecuritySettings@@UAE@XZ @ 1 NONAME ; CWPASecuritySettings::~CWPASecuritySettings(void)
-	??1CWPASecuritySettingsUi@@UAE@XZ @ 2 NONAME ; CWPASecuritySettingsUi::~CWPASecuritySettingsUi(void)
-	?Cvt@CWPASecuritySettingsUi@@SAHXZ @ 3 NONAME ; int CWPASecuritySettingsUi::Cvt(void)
-	?DeleteL@CWPASecuritySettings@@QBEXK@Z @ 4 NONAME ; void CWPASecuritySettings::DeleteL(unsigned long) const
-	?EditL@CWPASecuritySettings@@QAEHAAVCWPASecuritySettingsUi@@ABVTDesC16@@@Z @ 5 NONAME ; int CWPASecuritySettings::EditL(class CWPASecuritySettingsUi &, class TDesC16 const &)
-	?IsValid@CWPASecuritySettings@@QBEHXZ @ 6 NONAME ; int CWPASecuritySettings::IsValid(void) const
-	?LoadL@CWPASecuritySettings@@QAEXKAAVCCommsDatabase@@@Z @ 7 NONAME ; void CWPASecuritySettings::LoadL(unsigned long, class CCommsDatabase &)
-	?NewL@CWPASecuritySettings@@SAPAV1@W4TSecurityMode@@@Z @ 8 NONAME ; class CWPASecuritySettings * CWPASecuritySettings::NewL(enum TSecurityMode)
-	?NewL@CWPASecuritySettingsUi@@SAPAV1@AAVCEikonEnv@@@Z @ 9 NONAME ; class CWPASecuritySettingsUi * CWPASecuritySettingsUi::NewL(class CEikonEnv &)
-	?SaveL@CWPASecuritySettings@@QBEXKAAVCCommsDatabase@@W4TTypeOfSaving@@K@Z @ 10 NONAME ; void CWPASecuritySettings::SaveL(unsigned long, class CCommsDatabase &, enum TTypeOfSaving, unsigned long) const
-	?SetWPAPreSharedKey@CWPASecuritySettings@@QAEHABVTDesC16@@@Z @ 11 NONAME ; int CWPASecuritySettings::SetWPAPreSharedKey(class TDesC16 const &)
-	?LoadL@CWPASecuritySettings@@QAEXKAAVCMDBSession@CommsDat@@@Z @ 12 NONAME ; void CWPASecuritySettings::LoadL(unsigned long, class CommsDat::CMDBSession &)
-	?SaveL@CWPASecuritySettings@@QBEXKAAVCMDBSession@CommsDat@@W4TTypeOfSaving@@K@Z @ 13 NONAME ; void CWPASecuritySettings::SaveL(unsigned long, class CommsDat::CMDBSession &, enum TTypeOfSaving, unsigned long) const
-	?SetWPADisabledEAPPlugin@CWPASecuritySettings@@QAEHABVTDesC8@@@Z @ 14 NONAME ; int CWPASecuritySettings::SetWPADisabledEAPPlugin(class TDesC8 const &)
-	?SetWPAEnabledEAPPlugin@CWPASecuritySettings@@QAEHABVTDesC8@@@Z @ 15 NONAME ; int CWPASecuritySettings::SetWPAEnabledEAPPlugin(class TDesC8 const &)
-
--- a/wlansecuritysettings/wpasecuritysettingsui/data/WPASecuritySettingsUI.rss	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,315 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file contains all the resources for the WPA Security Settings UI. 
-*
-*/
-
-/*
-* %version: tr1cfwln#20 %
-*/
-
-//  RESOURCE IDENTIFIER
-NAME    AWAS // 4 letter ID
-
-//  INCLUDES
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.loc>
-
-#include "WPASecuritySettingsUI.hrh"
-#include <wpasecuritysettingsui.loc>
-
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf="WPASecuritySettings"; }
-
-
-//----------------------------------------------------
-//
-//  r_wpa_security_settings_menubar
-//  Menubar    
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_wpa_security_settings_menubar
-    {
-    titles=
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_wpa_security_settings_menu;
-            }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//  r_wpa_security_settings_menu
-//  The Options menu
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_wpa_security_settings_menu
-    {
-    items=
-        {
-        MENU_ITEM 
-            { 
-            command = EWpaSelCmdChange; 
-            txt = qtn_set_options_change; 
-            flags = EEikMenuItemAction;
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt = qtn_options_help; 
-            },
-
-        MENU_ITEM 
-            { 
-            command = EAknCmdExit; 
-            txt = qtn_options_exit; 
-            }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//    r_wpasettings_pane_softkeys_options_back_edit
-//    WPA Security Settings softkeys
-//
-//----------------------------------------------------
-//
-RESOURCE CBA r_wpasettings_pane_softkeys_options_back_edit
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOptions; txt = text_softkey_option; },
-        CBA_BUTTON { id = EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON { id = EWpaSelCmdChange; txt = qtn_msk_change; }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//  r_wpasettings_dialog
-//  WPA Security Settings main dialog
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_wpasettings_dialog
-    {
-    flags = EEikDialogFlagWait | EEikDialogFlagNoDrag | 
-            EEikDialogFlagNoTitleBar | EEikDialogFlagFillAppClientRect |
-            EEikDialogFlagCbaButtons;
-
-    buttons = r_wpasettings_pane_softkeys_options_back_edit;
-
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtSettingListBox;
-            id = KWpaMainSettingsListboxId;
-            control = LISTBOX 
-                { 
-                flags = EAknListBoxSelectionList;
-                };
-            }
-        };
-    }
-
-
-//----------------------------------------------------
-//   
-//  r_setting_app_edwin_key_data
-//  Window to enter key data
-//
-//----------------------------------------------------
-//
-RESOURCE EDWIN r_setting_app_edwin_key_data
-    {
-    avkon_flags = EAknEditorFlagNoT9;
-    allowed_input_modes = EAknEditorTextInputMode | 
-    					  EAknEditorNumericInputMode | 
-    					  EAknEditorHalfWidthTextInputMode;
-    default_case = EAknEditorLowerCase;
-    maxlength = EMaxLengthOfPreSharedKey;
-    lines = 8;
-    }
-
-
-//----------------------------------------------------
-//   
-//  r_text_setting_page_key_data
-//  Setting page for entering key data
-//
-//----------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_key_data
-    {
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    number= EAknSettingPageNoOrdinalDisplayed;
-    label= qtn_wlan_sett_preshared_key;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_key_data;
-    }
-
-
-
-//----------------------------------------------------
-//   
-//  r_setting_app_listbox
-//  Listbox for setting page
-//
-//----------------------------------------------------
-//
-RESOURCE LISTBOX r_setting_app_listbox
-    {
-    flags = EEikListBoxMultipleSelection;
-    }
-
-
-
-//----------------------------------------------------
-//
-//    r_wpasettings_pane_softkeys_ok_cancel_select
-//    WEP Security Settings softkeys
-//
-//----------------------------------------------------
-//
-RESOURCE CBA r_wpasettings_pane_softkeys_ok_cancel_select
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = text_softkey_ok; },
-        CBA_BUTTON { id = EAknSoftkeyCancel; txt = text_softkey_cancel; },
-        CBA_BUTTON { id = EAknSoftkeyOk; txt = qtn_msk_select; }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//   
-//  r_radio_button_setting_page
-//  Setting page with radio buttons
-//
-//----------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_radio_button_setting_page
-    {
-    number = EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = r_wpasettings_pane_softkeys_ok_cancel_select;
-    type =  EAknSetListBox;
-    editor_resource_id= r_setting_app_listbox;
-    }
-
-
-
-//----------------------------------------------------
-//   
-//    r_wpa_sec_sett_conf_query
-//    ConfirmationQuery dialog
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_wpa_sec_sett_conf_query
-	{
-	flags = EGeneralQueryFlags;
-	buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-	items =
-		{
-		DLG_LINE
-			{
-			type = EAknCtQuery;
-			id = EGeneralQuery;
-			control = AVKON_CONFIRMATION_QUERY
-				{
-				layout = EConfirmationQueryLayout;
-				};
-			}
-		};
-	}
-
-
-
-
-RESOURCE TBUF r_wpa_mode
-    { 
-    buf = qtn_wlan_sett_wpa_mode;
-    }
-        
-RESOURCE TBUF r_wpa_eap_config
-    { 
-    buf = qtn_wlan_sett_eap_plugin_config;
-    }
-        
-RESOURCE TBUF r_wpa_tkip_cipher
-    { 
-    buf = qtn_wlan_sett_allow_tkip;
-    }
-        
-RESOURCE TBUF r_wpa_mode_eap
-    { 
-    buf = qtn_wlan_sett_wpa_mode_eap;
-    }
-
-RESOURCE TBUF r_wpa_mode_preshared_key
-    { 
-    buf = qtn_wlan_sett_wpa_mode_preshared_key;
-    }
-
-RESOURCE TBUF r_wpa_cipher_allowed
-    { 
-    buf = qtn_wlan_sett_tkip_allowed;
-    }
-
-RESOURCE TBUF r_wpa_cipher_not_allowed
-    { 
-    buf = qtn_wlan_sett_tkip_not_allowed;
-    }
-
-RESOURCE TBUF r_wpa_preshared_key_must_be_defined
-    { 
-    buf = qtn_selec_setting_compulsory;
-    }
-
-RESOURCE TBUF r_info_preshared_key_too_short
-    {
-    buf = qtn_wlan_info_preshared_key_too_short;
-    }
-
-RESOURCE TBUF r_info_preshared_key_not_hex
-    {
-    buf = qtn_wlan_info_preshared_key_not_hex;
-    }
-
-RESOURCE TBUF r_wpa_preshared_keydata_missing
-    {
-    buf = qtn_wlan_quest_preshared_key_data_missing;
-    }
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/eabi/WPASecuritySettingsUI_EKA2_ALRu.def	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-EXPORTS
-	_ZN20CWPASecuritySettings4NewLE13TSecurityMode @ 1 NONAME
-	_ZN20CWPASecuritySettings5EditLER22CWPASecuritySettingsUiRK7TDesC16 @ 2 NONAME
-	_ZN20CWPASecuritySettings5LoadLEmR14CCommsDatabase @ 3 NONAME
-	_ZN20CWPASecuritySettingsD0Ev @ 4 NONAME
-	_ZN20CWPASecuritySettingsD1Ev @ 5 NONAME
-	_ZN20CWPASecuritySettingsD2Ev @ 6 NONAME
-	_ZN22CWPASecuritySettingsUi3CvtEv @ 7 NONAME
-	_ZN22CWPASecuritySettingsUi4NewLER9CEikonEnv @ 8 NONAME
-	_ZN22CWPASecuritySettingsUiD0Ev @ 9 NONAME
-	_ZN22CWPASecuritySettingsUiD1Ev @ 10 NONAME
-	_ZN22CWPASecuritySettingsUiD2Ev @ 11 NONAME
-	_ZNK20CWPASecuritySettings5SaveLEmR14CCommsDatabase13TTypeOfSavingm @ 12 NONAME
-	_ZNK20CWPASecuritySettings7DeleteLEm @ 13 NONAME
-	_ZNK20CWPASecuritySettings7IsValidEv @ 14 NONAME
-	_ZN20CWPASecuritySettings18SetWPAPreSharedKeyERK7TDesC16 @ 15 NONAME
-	_ZN20CWPASecuritySettings5LoadLEmRN8CommsDat11CMDBSessionE @ 16 NONAME
-	_ZNK20CWPASecuritySettings5SaveLEmRN8CommsDat11CMDBSessionE13TTypeOfSavingm @ 17 NONAME
-	_ZN20CWPASecuritySettings22SetWPAEnabledEAPPluginERK6TDesC8 @ 18 NONAME
-	_ZN20CWPASecuritySettings23SetWPADisabledEAPPluginERK6TDesC8 @ 19 NONAME
-
--- a/wlansecuritysettings/wpasecuritysettingsui/group/WPASecuritySettingsUI.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is project specification file for the WPASecuritySettingsUI. 
-*
-*/
-
-/*
-* %version: tr1cfwln#20 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET      WPASecuritySettingsUI.dll
-TARGETTYPE  DLL
-
-CAPABILITY CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-
-START RESOURCE  ../data/WPASecuritySettingsUI.rss
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END  // RESOURCE
-
-
-SOURCEPATH ../src
-
-SOURCE WPASecuritySettings.cpp
-SOURCE WPASecuritySettingsImpl.cpp
-SOURCE WPASecuritySettingsUI.cpp
-SOURCE WPASecuritySettingsUiImpl.cpp
-SOURCE WPASecuritySettingsDlg.cpp
-SOURCE WPASecuritySettingsUiPanic.cpp
-
-// Component specific internal headers 
-USERINCLUDE			../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY FeatMgr.lib
-LIBRARY hlplch.lib
-LIBRARY euser.lib
-LIBRARY cone.lib
-LIBRARY eikcore.lib
-LIBRARY eikcoctl.lib
-LIBRARY avkon.lib
-LIBRARY eikdlg.lib
-LIBRARY bafl.lib
-LIBRARY commonengine.lib
-LIBRARY commdb.lib
-LIBRARY ecom.lib
-LIBRARY commsdat.lib
-
-DEBUGLIBRARY flogger.lib
-
-#if defined(ARMCC)
-    DEFFILE ../eabi/WPASecuritySettingsUI_EKA2_ALR.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/WPASecuritySettingsUI_EKA2_ALR.def
-#endif
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/group/bld.inf	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file provides the information required for building the whole of a WPASecuritySettingsUI. 
-*
-*/
-
-/*
-* %version: tr1cfwln#19 %
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-// export iby files
-../Rom/WPASecuritySettingsUI.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(WPASecuritySettingsUI.iby)
-../Rom/WPASecuritySettingsUIResources.iby	LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(WPASecuritySettingsUIResources.iby)
-
-// export localised loc file
-../loc/wpasecuritysettingsui.loc	MW_LAYER_LOC_EXPORT_PATH(wpasecuritysettingsui.loc)
-
-
-PRJ_MMPFILES
-// real implementation for WLAN products
-./WPASecuritySettingsUI.mmp
-// stub implementation for non-WLAN products
-./wpasecuritysettingsuistub.mmp
-
-
-PRJ_TESTMMPFILES
-
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/group/wpasecuritysettingsuistub.mmp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Project specification file for stub implementation of 
-*              WPA UI for non-WLAN products to support linking. 
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET      wpasecuritysettingsuistub.dll
-TARGETTYPE  DLL
-
-CAPABILITY CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../src
-
-SOURCE wpasecuritysettingsstub.cpp
-SOURCE wpasecuritysettingsuistub.cpp
-
-// Component specific internal headers 
-USERINCLUDE			../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-//Used libraries
-LIBRARY euser.lib
-
-#if defined(ARMCC)
-    DEFFILE ../eabi/WPASecuritySettingsUI_EKA2_ALR.def
-#elif defined( WINSCW )
-    DEFFILE ../bwinscw/WPASecuritySettingsUI_EKA2_ALR.def
-#endif
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/inc/SecuritySettingsLogger.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Logger utility.
-*
-*/
-
-/*
-* %version: tr1cfwln#6 %
-*/
-
-#ifndef SECURITYSETTINGSLOGGER_H
-#define SECURITYSETTINGSLOGGER_H
-
-
-// INCLUDES
-
-#include <e32std.h>
-#include <e32def.h>
-#include <flogger.h>
-
-
-#ifdef _DEBUG
-#define __SEC_SETT_LOG__
-#endif // _DEBUG
-
-
-#ifdef __SEC_SETT_LOG__
-
-// CONSTANTS
-
-// SecuritySettingsLogger logging directory.
-_LIT( KSecSettLogDir,                   "TestSecSett" );
-// SecSett log file name.
-_LIT( KSecSettLogFile,                  "SecSett.log" );
-// Format string: enter function.
-_LIT( KSecSettLogEnterFn,               "-> %S" );
-// Format string: leave function.
-_LIT( KSecSettLogLeaveFn,               "<- %S" );
-// Format string: time.
-_LIT( KSecSettLogTimeFormatString,      "%H:%T:%S:%*C2" );
-// Format string: timestamp.
-_LIT( KSecSettLogTimeStampFormatString, "%S %S" );
-
-// DEFINES
-
-// Write log: enter function.
-#define CLOG_ENTERFN( a )           \
-    {                               \
-    _LIT( temp, a );                \
-    RFileLogger::WriteFormat        \
-        (                           \
-        KSecSettLogDir,             \
-        KSecSettLogFile,            \
-        EFileLoggingModeAppend,     \
-        KSecSettLogEnterFn,         \
-        &temp                       \
-        );                          \
-    }
-
-// Write log: leave function.
-#define CLOG_LEAVEFN( a )           \
-    {                               \
-    _LIT( temp, a );                \
-    RFileLogger::WriteFormat        \
-        (                           \
-        KSecSettLogDir,             \
-        KSecSettLogFile,            \
-        EFileLoggingModeAppend,     \
-        KSecSettLogLeaveFn,         \
-        &temp                       \
-        );                          \
-    }
-
-// Write log: string 'a'.
-#define CLOG_WRITE( a )             \
-    {                               \
-    _LIT( temp, a );                \
-    RFileLogger::Write              \
-        (                           \
-        KSecSettLogDir,             \
-        KSecSettLogFile,            \
-        EFileLoggingModeAppend,     \
-        temp                        \
-        );                          \
-    }
-
-// Write log: formatted.
-#define CLOG_WRITE_FORMAT( a, b )   \
-    {                               \
-    _LIT( temp, a );                \
-    RFileLogger::WriteFormat        \
-        (                           \
-        KSecSettLogDir,             \
-        KSecSettLogFile,            \
-        EFileLoggingModeAppend,     \
-        temp,                       \
-        b                           \
-        );                          \
-    }
-
-// Write log: timestamp.
-#define CLOG_WRITE_TIMESTAMP( a )                                   \
-    {                                                               \
-    _LIT( temp, a );                                                \
-    TTime time;                                                     \
-    time.HomeTime();                                                \
-    TBuf<32> timeBuf;                                               \
-    TRAPD( err, time.FormatL( timeBuf, KSecSettLogTimeFormatString ) ); \
-    if ( !err )                                                     \
-        {                                                           \
-        RFileLogger::WriteFormat                                    \
-            (                                                       \
-            KSecSettLogDir,                                         \
-            KSecSettLogFile,                                        \
-            EFileLoggingModeAppend,                                 \
-            KSecSettLogTimeStampFormatString,                       \
-            &temp,                                                  \
-            &timeBuf                                                \
-            );                                                      \
-        }                                                           \
-    }
-
-#else // not defined __SEC_SETT_LOG__
-
-// DEFINES
-
-// Empty definition (disable log).
-#define CLOG_ENTERFN( a )
-
-// Empty definition (disable log).
-#define CLOG_LEAVEFN( a )
-
-// Empty definition (disable log).
-#define CLOG_WRITE( a )
-
-// Empty definition (disable log).
-#define CLOG_WRITE_FORMAT( a, b )
-
-// Empty definition (disable log).
-#define CLOG_WRITE_TIMESTAMP( a )
-
-#endif // __SEC_SETT_LOG__
-
-#endif 
--- a/wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsDefs.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Definitions. 
-*
-*/
-
-/*
-* %version: tr1cfwln#9 %
-*/
-
-#ifndef WPASECURITYSETTINGSDEFS_H
-#define WPASECURITYSETTINGSDEFS_H
-
-
-// CONSTANTS
-
-
-// UID of application containing help texts (General Settings).
-LOCAL_D const TUid KWPASecuritySettingsUiHelpMajor = { 0x100058EC };
-
-
-#endif  // WPASECURITYSETTINGSDEFS_H
--- a/wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsDlg.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,307 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declares dialog. 
-*
-*/
-
-/*
-* %version: tr1cfwln#20 %
-*/
-
-#ifndef WPA_SECURITY_SETTINGS_DLG_H
-#define WPA_SECURITY_SETTINGS_DLG_H
-
-
-// ENUMERATIONS
-
-// Members to be showed in the setting pages
-enum TWpaMember
-    {
-    EWpaMode,           // WPA mode
-    EWpaEapConfig,      // EAP Plugin configuration
-    EWpaWpa2Only,       // Wpa2 only mode
-    EWpaPreSharedKey    // Pre-shared key
-    };
-
-
-// INCLUDES
-#include <AknDialog.h>
-#include <eiklbo.h>
-#include <aknlists.h>
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <commsdat.h>
-#else
-#include <commsdat.h>
-#include <commsdat_partner.h>
-#endif
-#include "WPASecuritySettingsImpl.h"
-
-// FORWARD DECLARATIONS
-class CAknTitlePane;
-class CWPASecuritySettingsImpl;
-class CEAPPluginConfigurationIf;
-
-
-// CLASS DECLARATION
-/**
-* CWPASecuritySettingsDlg dialog class
-*/
-NONSHARABLE_CLASS( CWPASecuritySettingsDlg ) : public CAknDialog, 
-                                               public MEikListBoxObserver
-    {
-
-    public: // Constructors and destructor
-
-        /**
-        * Create and launch dialog.
-        * @param aSecuritySettings Security settings
-        * @param aTitle Title of the dialog
-        * @return The ID of the button that closed the dialog
-        */
-        TInt ConstructAndRunLD( CWPASecuritySettingsImpl* aSecuritySettings,
-                                const TDesC& aTitle );
-
-
-        /**
-        * Two-phase construction.
-        * @param aEventStore A reference to hold the events happened
-        * @param aIapId Id of the IAP.
-        * @param aPlugin The EAP Configuration plugin.
-        * @return The constructed CWPASecuritySettingsDlg object.
-        */
-        static CWPASecuritySettingsDlg* NewL( TInt& aEventStore, 
-                                          const TUint32 aIapId,
-                                          CEAPPluginConfigurationIf* aPlugin );
-
-        /**
-        * Destructor.
-        */
-        ~CWPASecuritySettingsDlg();
-
-
-	protected:
-        /**
-        * Constructor.
-        * @param aEventStore A reference to hold the events happened
-        * @param aIapId Id of the IAP.
-        * @param aPlugin The EAP Configuration plugin.
-        */
-        CWPASecuritySettingsDlg( TInt& aEventStore, const TUint32 aIapId,
-                                 CEAPPluginConfigurationIf* aPlugin );
-
-
-    public:     // Functions from base classes
-        /**
-        * Handle key events. 
-        * @param aKeyEvent: key event
-        * @param aType: type of event
-        * @return The key response, if it was consumed or not. 
-        */
-		TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                     TEventCode aType );
-
-	private:    // Functions from base classes
-
-        /**
-        * This function is called by the dialog framework before the dialog is 
-        * sized and laid out.
-        */
-        virtual void PreLayoutDynInitL();
-
-
-        /**
-        * Handles a dialog button press for the specified button 
-        * @param aButtonId  The ID of the button that was activated.
-        * @return   ETrue to validate and exit the dialog, 
-        *           EFalse to keep the dialog active
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-
-		/**
-        * Processes user commands.
-        * @param aCommandId ID of the command to respond to. 
-        */
-		virtual void ProcessCommandL( TInt aCommandId );
-
-
-		/**
-        * Handles list box events.
-        * @param aListBox   The originating list box. 
-        * @param aEventType A code for the event.
-        */
-		void HandleListBoxEventL( CEikListBox* aListBox, 
-                                  TListBoxEvent aEventType );
-
-        /**
-        * Get help context.
-        * @param aContext Help context is returned here.
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-        /**
-        * Initialize menu pane.
-        * @param aResourceId Menu pane resource id.
-        * @param CEikMenuPane Menu pane.
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-
-    protected:  // New functions
-
-        /**
-        * Handles listbox data change
-        */
-        void HandleListboxDataChangeL();
-
-
-        /**
-        * Fills up the listbox with data
-        * @param aItemArray Array where to add the elements
-        * @param arr        Array to be used as list elements
-        * @param aRes       Array of resource IDs to be used for the 
-        *                   elements of arr
-        */
-        void FillListWithDataL( CDesCArrayFlat& aItemArray, 
-                                const TWpaMember& arr, const TInt* aRes );
-
-
-        /**
-        * Updates one 'textual' listbox item for the given member
-        * @param aMember    Value specifying which member has to be added to 
-        *                   the list
-        * @param aRes       Resource ID for the 'title text' for this member
-        * @param aPos       The current position of the item in the list
-        */
-        void UpdateTextualListBoxItemL( TWpaMember aMember, TInt aRes, 
-                                        TInt aPos );
-
-
-        /**
-        * Creates one 'textual' listbox item for the given member
-        * @param aMember    Value specifying which member has to be added to
-        *                   the list
-        * @param aRes       Resource ID for the 'title text' for this member
-        * @return The created listbox item text.
-        */
-        HBufC* CreateTextualListBoxItemL( TWpaMember aMember, TInt aRes );
-
-
-        /**
-        * Changes one setting. The setting, which is
-        * highlighted as current in the listbox is changed.
-        * @param aQuick ETrue if the setting is "two-choices", and can be 
-        *               automatically changed, without showing the list of 
-        *               elements
-        */
-        void ChangeSettingsL( TBool aQuick );
-
-
-        /**
-        * Shows a popup setting page (radio buttons) for the given member
-        * @param aDataMember    The member which needs to be changed
-        * @return   A boolean indicating whether the current setting
-        *           has been changed or not.
-        */
-        TBool ShowPopupSettingPageL( TWpaMember aDataMember );
-
-
-        /**
-        * Shows a popup text setting page for the given member
-        * @return   A boolean indicating whether the current setting
-        *           has been changed or not.
-        */
-        TBool ShowPopupTextSettingPageL();
-
-
-        /**
-        * Fills up a pop-up radio button setting page with the currently
-        * valid and available choices for the given member.
-        * @param aData      The member whose new setting is needed
-        * @param aCurrvalue The current value of the setting
-        * @return   An array of choices for the given member, pushed to the 
-        *           CleanupStack.
-        */
-        CDesCArrayFlat* FillPopupSettingPageLC( TWpaMember aData,
-                                                TInt& aCurrvalue );
-
-
-        /**
-        * Updates the given member's data with the new setting from the setting
-        * page.
-        * @param aData      The member to update
-        * @param aCurrvalue The new value
-        * @return   A boolean indicating if the value is actually changed
-        */
-        TBool UpdateFromPopupSettingPage( TWpaMember aData, TBool aCurrvalue );
-
-
-        /**
-        * Cleanup for the iEapConfigActive semaphore flag
-        * @since S60 5.0
-        * @param aPtr Pointer to this class
-        */
-        static void ResetEapConfigFlag( TAny* aPtr );
-        
-        /**
-        * @see CEikDialog
-        */
-        void HandleDialogPageEventL( TInt aEventID );
-
-    private: //data
-
-        // Stores the name of the connection, to be showed as the title.
-      	TBuf<CommsDat::KMaxTextLength> iConnectionName;
-
-        // Title pane. Not owned.
-        CAknTitlePane* iTitlePane;
-
-        // Pointer to the old title. Owned.
-        HBufC* iOldTitleText;
-
-        // Owned through resources, destroyed automatically by the dialog.
-        CAknSettingStyleListBox* iList;
-
-        // Array of the items. Not owned.
-        CDesCArrayFlat* iItemArray;
-
-        // Fields of the main view. Not owned.
-        TWpaMember* iFieldsMain;
-
-        // Titles of the main view. Not owned.
-        TInt* iTitlesMain;
-
-        // Pointer to the WPA Security Settings. Not owned.
-        CWPASecuritySettingsImpl* iSecuritySettings;
-
-        // To hold the events. Not owned.
-        TInt* iEventStore;
-        
-        // The Id of the AP.
-        TUint32 iIapId;
-
-        // The EAP Configuration plugin. Not owned.
-        CEAPPluginConfigurationIf* iPlugin;
-        
-        // Indicates whether the EAP plugin configuration is active
-        TBool iEapConfigActive;
-        
-        TBuf8<KWLANEAPLISTLENGTH> iEnabledPluginList;
-        TBuf8<KWLANEAPLISTLENGTH> iDisabledPluginList;
-    };
-
-
-#endif      // WPA_SECURITY_SETTINGS_DLG_H
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsImpl.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,305 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class CWPASecuritySettingsImpl.  
-*
-*/
-
-/*
-* %version: tr1cfwln#26 %
-*/
-
-#ifndef WPASECURITYSETTINGSIMPL_H
-#define WPASECURITYSETTINGSIMPL_H
-
-// INCLUDES
-#include <e32base.h>
-#include <WlanCdbCols.h>
-
-#include <WPASecuritySettingsUI.h>
-
-#include <metadatabase.h>
-using namespace CommsDat;
-
-
-
-// CONST DECLARATIONS
-#define KWLANEAPLISTLENGTH 1024     // Max length of the EAP Plugin list
-
-
-// FORWARD DECLARATIONS
-class CCommsDatabase;
-class CEAPPluginConfigurationIf;
-
-// CLASS DECLARATION
-
-/**
-* WPA Security Settings.
-* Implementation behind proxy class CWPASecuritySettings.
-*/
-NONSHARABLE_CLASS( CWPASecuritySettingsImpl ) : public CBase
-    {
-
-    public:     // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aSecurityMode  The chosen security mode. It can be 
-        *                       ESecurityMode8021x or ESecurityModeWpa
-        * @return The constructed CWPASecuritySettings object.
-        */
-        static CWPASecuritySettingsImpl* NewL( TSecurityMode aSecurityMode );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CWPASecuritySettingsImpl();
-
-
-    protected:  // Constructors
-
-        /**
-        * Constructor.
-        * @param aSecurityMode  The chosen security mode. It can be 
-        *                       ESecurityMode8021x or ESecurityModeWpa
-        */
-        CWPASecuritySettingsImpl( TSecurityMode aSecurityMode );
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-
-
-    public:     // New methods
-
-        /**
-        * Load from database.
-        * @param aIapId Wlan Service Table Id of the IAP to be loaded
-        * @param aCommsDb Comms database.
-        */
-        void LoadL( TUint32 aIapId, CCommsDatabase& aCommsDb );
-        
-
-        /**
-        * Save to database.
-        * @param aIapId     Wlan Service Table Id of the IAP to be saved
-        * @param aCommsDb   Comms database.
-        * @param aTypeOfSaving	Tells what kind of AP we are going to save: it 
-        *                       can be ESavingEditedAP, ESavingBrandNewAP, or 
-        *                       ESavingNewAPAsACopy
-        * @param aOldIapId  The old Id of the IAP; it is used to save the EAP 
-        *                   configuration, only when aIsNewAP is ETrue
-        */
-        void SaveL( TUint32 aIapId, CCommsDatabase& aCommsDb, 
-                    TTypeOfSaving aTypeOfSaving, TUint32 aOldIapId );
-
-
-        /**
-        * Delete from database. It actually just removes EAP Configuration.
-        * @param aIapId Id of the IAP to be saved
-        */
-        void DeleteL( TUint32 aIapId );
-
-
-        /**
-        * Tells if the settings are valid and can be saved
-        * @return ETrue if all the compulsory settings have been entered
-        */
-        TBool IsValid();
-
-
-        /**
-        * Sets the Pre-shared key
-        * @param aPreSharedKey  The key to be set
-        * @return KErrNone if successful, or an error code
-        */
-        TInt SetWPAPreSharedKey( const TDesC& aPreSharedKey );
-
-        /**
-        * Gets the type of Security set.
-        * @return The security mode in use. It can be ESecurityMode8021x or
-        *         ESecurityModeWpa
-        */
-        inline TSecurityMode SecurityMode() const;
-
-        
-        /**
-        * Tells if Pre-shared key is in use or not
-        * @return   ETrue if Pre-shared key is in use
-        */
-        inline TBool WPAMode() const;
-
-        
-        /**
-        * Sets the use of Pre-shared key.
-        * @param aWPAMode   ETrue if pre-shared key is in use
-        */
-        inline void SetWPAMode( const TBool aWPAMode );
-
-
-        /**
-        * Tells if it is WPA2 Only mode
-        * @return ETrue if it is WPA2 Only mode
-        */
-        inline TBool Wpa2Only() const;
-
-
-        /**
-        * Sets the WPA2 Only mode enabling variable
-        * @param aAllowed   ETrue if WPA2 Only mode is enabled
-        */
-        inline void SetWpa2Only( const TBool aAllowed );
-
-
-        /**
-        * Returns the Pre-shared key
-        * @return The pre-shared key
-        */
-        inline TDes8* WPAPreSharedKey();
-
-
-        /**
-        * Sets the Pre-shared key
-        * @param aPreSharedKey  The key to be set
-        */
-        inline void SetWPAPreSharedKey( const TDesC8& aPreSharedKey );
-
-
-        /**
-        * Returns the content of the WlanEapList column of WLANServiceTable
-        * @return The content string
-        */
-        inline TDes* WPAEAPPlugin();
-
-        /**
-        * Returns the content of the WlanEnabledEapList column of 
-        * WLANServiceTable
-        * @return The content string. Ownership not passed!
-        */
-        inline HBufC8* WPAEnabledEAPPlugin();
-        
-        /**
-        * Returns the content of the WlanDisabledEapList column of 
-        * WLANServiceTable
-        * @return The content string. Ownership not passed!
-        */
-        inline HBufC8* WPADisabledEAPPlugin();
-
-        /**
-        * Sets the content of the WlanEapList column of WLANServiceTable
-        * @param aPluginList The content string to be set
-        */
-        inline void SetWPAEAPPlugin( const TDes& aPluginList );
-
-        /**
-        * Sets the content of the WlanEnabledEapList column of WLANServiceTable 
-        * (for expanded EAP types)
-        * @param aEnabledPluginList Enumeration of enabled plugins
-        * @return KErrNone if successful, or an error code
-        */
-        TInt SetWPAEnabledEAPPlugin( const TDesC8& aEnabledPluginList );
-
-        /**
-        * Sets the content of the WlanDisabledEapList column of WLANServiceTable 
-        * (for expanded EAP types)
-        * @param aDisabledPluginList Enumeration of disabled plugins
-        * @return KErrNone if successful, or an error code
-        */
-        TInt SetWPADisabledEAPPlugin( const TDesC8& aDisabledPluginList );
-
-        /**
-        * Sets the Id of the AP 
-        * @param aIapId  The Id to be set
-        */
-        inline void SetIapId( const TUint32 aIapId );
-        
-        /**
-        * Returns the Id of the AP 
-        * @return The Id
-        */
-        inline const TUint32 IapId();
-
-        /**
-        * Returns the pointer to the EAP Configuration plugin
-        * @return The EAP Configuration plugin
-        */
-        inline CEAPPluginConfigurationIf* Plugin();
-        
-        /**
-        * Load from database.
-        * @param aIapId Wlan Service Table Id of the IAP to be loaded
-        * @param aSession CommsDat session.
-        */
-        void LoadL( TUint32 aIapId, CMDBSession& aSession );
-        
-        
-        /**
-        * Save to database.
-        * @param aIapId     Wlan Service Table Id of the IAP to be saved
-        * @param aSession   CommsDat session.
-        * @param aTypeOfSaving	Tells what kind of AP we are going to save: it 
-        *                       can be ESavingEditedAP, ESavingBrandNewAP, or 
-        *                       ESavingNewAPAsACopy
-        * @param aOldIapId  The old Id of the IAP; it is used to save the EAP 
-        *                   configuration, only when aIsNewAP is ETrue
-        */
-        void SaveL( TUint32 aIapId, CMDBSession& aSession, 
-                    TTypeOfSaving aTypeOfSaving, TUint32 aOldIapId );
-
-    private:
-        /**
-        * Checks whether the given string is a valid PSK
-        * @since S60 5.0
-        * @param aPsk The string to be checked
-        * @return ETrue if the string is a valid PSK, EFalse otherwise.
-        */
-        TBool IsValidPsk( const TDesC8& aPsk );
-
-    private:    // Data 
-
-        // Security mode in use
-        TSecurityMode iSecurityMode;
-
-        // Pre-shared key in use or not
-        TBool iWPAMode;
-
-        // The content of the WlanEapList column of WLANServiceTable
-        TBuf<KWLANEAPLISTLENGTH> iWPAEAPPlugin;
-
-        // The pre-shared key
-        TBuf8<KWlanWpaPskLength> iWPAPreSharedKey;
-
-        // The content of the WlanEnabledEapList column of WLANServiceTable.
-        // Owned.
-        HBufC8 *iWPAEnabledEAPPlugin;
-        
-        // The content of the WlanDisabledEapList column of WLANServiceTable.
-        // Owned.
-        HBufC8 *iWPADisabledEAPPlugin;        
-
-        // WPA2 Only mode enabled or not
-        TBool iWpa2Only;
-        
-        // The Id of the AP.
-        TUint32 iIapId;
-
-        // The EAP Configuration plugin. Owned.
-        CEAPPluginConfigurationIf* iPlugin;
-    };
-
-// Include inline functions
-#include "WPASecuritySettingsImpl.inl"
-
-
-#endif 
--- a/wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsImpl.inl	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: CWPASecuritySettingsImpl inline functions
-*
-*/
-
-/*
-* %version: tr1cfwln#15 %
-*/
-
-#ifndef WPASECURITYSETTINGSIMPL_INL
-#define WPASECURITYSETTINGSIMPL_INL
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SecurityMode
-// ---------------------------------------------------------
-//
-inline TSecurityMode CWPASecuritySettingsImpl::SecurityMode() const
-    {
-    return iSecurityMode;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::WPAMode
-// ---------------------------------------------------------
-//
-inline TBool CWPASecuritySettingsImpl::WPAMode() const
-    { 
-    return iWPAMode; 
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::Wpa2Only
-// ---------------------------------------------------------
-//
-inline TBool CWPASecuritySettingsImpl::Wpa2Only() const
-    { 
-    return iWpa2Only; 
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::WPAPreSharedKey
-// ---------------------------------------------------------
-//
-inline TDes8* CWPASecuritySettingsImpl::WPAPreSharedKey()
-    { 
-    return &iWPAPreSharedKey; 
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::WPAEAPPlugin
-// ---------------------------------------------------------
-//
-inline TDes* CWPASecuritySettingsImpl::WPAEAPPlugin()
-    {
-    return &iWPAEAPPlugin;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::WPAEnabledEAPPlugin
-// ---------------------------------------------------------
-//
-inline HBufC8* CWPASecuritySettingsImpl::WPAEnabledEAPPlugin()
-    {
-    return iWPAEnabledEAPPlugin;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::WPADisabledEAPPlugin
-// ---------------------------------------------------------
-//
-inline HBufC8* CWPASecuritySettingsImpl::WPADisabledEAPPlugin()
-    {
-    return iWPADisabledEAPPlugin;
-    }
-        
-    
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SetWPAMode
-// ---------------------------------------------------------
-//
-inline void CWPASecuritySettingsImpl::SetWPAMode( const TBool aWPAMode )
-    { 
-    iWPAMode = aWPAMode; 
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SetWpa2Only
-// ---------------------------------------------------------
-//
-inline void CWPASecuritySettingsImpl::SetWpa2Only( const TBool aWpa2Only )
-    { 
-    iWpa2Only = aWpa2Only; 
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SetWPAPreSharedKey
-// ---------------------------------------------------------
-//
-inline void CWPASecuritySettingsImpl::SetWPAPreSharedKey(
-                                              const TDesC8& aWPAPreSharedKey )
-    {
-    iWPAPreSharedKey = aWPAPreSharedKey;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SetIapId
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsImpl::SetIapId( const TUint32 aIapId )
-	{
-	iIapId = aIapId;
-	}
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::IapId
-// ---------------------------------------------------------
-//
-const TUint32 CWPASecuritySettingsImpl::IapId()
-	{
-	return iIapId;
-	}
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SetWPAEAPPlugin
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsImpl::SetWPAEAPPlugin( const TDes& aPluginList )
-	{
-	iWPAEAPPlugin.Copy( aPluginList );
-	}
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::Plugin
-// ---------------------------------------------------------
-//
-CEAPPluginConfigurationIf* CWPASecuritySettingsImpl::Plugin()
-	{
-	return iPlugin;
-	}
-
-
-#endif 
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsUI.hrh	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file contains declarations for resources of WPASecuritySettingsUI. The file can be included in C++ or resource file. 
-*
-*/
-
-/*
-* %version: %
-*/
-
-#ifndef WPASecuritySettingsUI_HRH
-#define WPASecuritySettingsUI_HRH
-
-
-// Menu command IDs
-enum TWpaSelectorMenuCommands
-    {
-    EWpaSelCmdChange = 2468
-    };
-
-
-// dialog line IDs
-enum TWpaSelectorDllDlgLineId 
-    {
-    KWpaMainSettingsListboxId = 3 
-    };
-
-
-
-
-// The minimum length of PreSharedKey in ASCII encoding
-#define EMinLengthOfPreSharedKeyAscii 8
-                                            
-// The maximum length of PreSharedKey in ASCII encoding
-#define EMaxLengthOfPreSharedKeyAscii 63
-
-// The required length of PreSharedKey in hexadecimal digits
-#define ELengthOfPreSharedKeyHex 64
-
-// The maximum number of bytes occupied by the PSK
-#define EMaxLengthOfPreSharedKey ELengthOfPreSharedKeyHex
-
-
-#endif      //  WPASecuritySettingsUI_HRH
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsUiImpl.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Declaration of class CWPASecuritySettingsUiImpl.  
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef WPASECURITYSETTINGSUIIMPL_H
-#define WPASECURITYSETTINGSUIIMPL_H
-
-// INCLUDES
-
-#include <e32base.h>
-
-
-// FORWARD DECLARATIONS
-
-class CEikonEnv;
-class CWPASecuritySettings;
-class CWPASecuritySettingsUiImpl;
-class CWPASecuritySettingsImpl;
-
-
-// CLASS DECLARATION
-
-/**
-* WPA Security Settings UI implementation (behind proxy class
-* CWPASecuritySettingsUi)
-*/
-NONSHARABLE_CLASS( CWPASecuritySettingsUiImpl ) : public CBase
-    {
-
-    public:     // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aEikEnv Eikon environment.
-        * @return The constructed CWPASecuritySettingsUiImpl object.
-        */
-        static CWPASecuritySettingsUiImpl* NewL( CEikonEnv& aEikEnv );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CWPASecuritySettingsUiImpl();
-
-    protected:  // Constructors
-
-        /**
-        * Constructor.
-        * @param aEikEnv Eikon environment.
-        */
-        CWPASecuritySettingsUiImpl( CEikonEnv& aEikEnv );
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-
-    public:     // New methods
-
-        /**
-        * Edit the settings.
-        * @param aSettings Settings to edit.
-        * @param aTitle Title Pane text to display during edit.
-        * @return Exit code. Value from CWPASecuritySettings::TEvent bits 
-        * combined.
-        */
-        TInt EditL( CWPASecuritySettingsImpl& aSettings, const TDesC& aTitle );
-
-
-    private:    // Data 
-
-        // To hold the events
-        TInt        iEventStore;
-
-        // Resource file offset.
-        TInt        iResOffset; 
-        
-        // Eikon environment. Not owned.
-        CEikonEnv*  iEikEnv;        
-    };
-
-#endif 
--- a/wlansecuritysettings/wpasecuritysettingsui/inc/WPASecuritySettingsUiPanic.h	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Panic function and codes.     
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-#ifndef WPASECURITYSETTINGSUIPANIC_H
-#define WPASECURITYSETTINGSUIPANIC_H
-
-// TYPES
-
-/**
-* Panic reasons for WPA Security Settings UI.
-*/
-enum TWpaSecuritySettingsPanicCodes
-	{
-    EUnknownCase,
-    ETableNotFound
-	};
-
-
-// FUNCTION DECLARATIONS
-
-/**
-* Panic the thread.
-* @param aReason Reason for the panic.
-*/
-void Panic( TWpaSecuritySettingsPanicCodes aPanic );
-
-#endif
--- a/wlansecuritysettings/wpasecuritysettingsui/loc/wpasecuritysettingsui.loc	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This is a localisation file for WPASecuritySettingsUI A .loc file is the one and only place where the logical strings to be localised are defined. 
-*
-*/
-
-/*
-* %version: %
-*/
-
-// LOCALISATION STRINGS
-
-
-//d:Command in options menu.
-//d:Modifies the currently selected item.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.0
-//
-#define qtn_set_options_change                  "Change"
-
-
-//d:First element of the Selection List
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wpa_mode                  "WPA/WPA2 mode"
-
-
-//d:Possible second element of the Selection List
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_eap_plugin_config         "EAP plug-in configuration"
-
-
-//d:Possible second element of the Selection List
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_preshared_key             "Pre-shared key"
-
-
-//d:Third element of the Selection List
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_allow_tkip                "WPA2-only mode"
-
-
-//d:Setting item for the first element of the Selection List
-//d:(qtn_wlan_sett_wpa_mode)
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wpa_mode_eap              "EAP"
-
-
-//d:Setting item for the first element of the Selection List
-//d:(qtn_wlan_sett_wpa_mode)
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_wpa_mode_preshared_key    "Pre-shared key"
-
-
-//d:Setting item for the third element of the Selection List
-//d:(qtn_wlan_sett_allow_tkip)
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_tkip_allowed              "No"
-
-
-//d:Setting item for the third element of the Selection List
-//d:(qtn_wlan_sett_allow_tkip)
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_tkip_not_allowed          "Yes"
-
-
-//d:Information note for the user when the entered key is too short
-//l:popup_snote_single_text_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_info_preshared_key_too_short   "Key must be at least 8 characters long"
-
-
-//d:Information note for the user when the entered key is not hexadecimal
-//l:popup_snote_single_text_window
-//w:
-//r:5.0
-//
-#define qtn_wlan_info_preshared_key_not_hex   "Invalid characters in pre-shared key. 64-digit key must be in hexadecimal format."
-
-
-//d:Confirmation query showed to the user when not all compulsory data have
-//d:been entered
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_quest_preshared_key_data_missing "Pre-shared key data is compulsory. Security settings will not be saved. Continue?"
-
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettings.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWPASecuritySettings.     
-*
-*/
-
-/*
-* %version: tr1cfwln#18 %
-*/
-
-// INCLUDE FILES
-
-#include "WPASecuritySettingsImpl.h"
-#include "WPASecuritySettingsUiImpl.h"
-
-#include <WPASecuritySettingsUI.h>
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CWPASecuritySettings* CWPASecuritySettings::NewL( 
-                                                TSecurityMode aSecurityMode )
-    {
-    CWPASecuritySettings* settings = new ( ELeave ) CWPASecuritySettings();
-    CleanupStack::PushL( settings );
-    settings->iImpl = CWPASecuritySettingsImpl::NewL( aSecurityMode );
-    CleanupStack::Pop( settings ); 
-    return settings;    
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::~CWPASecuritySettings
-// ---------------------------------------------------------
-//
-EXPORT_C CWPASecuritySettings::~CWPASecuritySettings()
-    {
-    delete iImpl;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::LoadL( TUint32 aIapId, 
-                                           CCommsDatabase& aCommsDb )
-    {
-    iImpl->LoadL( aIapId, aCommsDb );
-    iImpl->SetIapId( aIapId );
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::SaveL( TUint32 aIapId, 
-                                           CCommsDatabase& aCommsDb, 
-                                           TTypeOfSaving aTypeOfSaving, 
-                                           TUint32 aOldIapId ) const
-    {
-    iImpl->SaveL( aIapId, aCommsDb, aTypeOfSaving, aOldIapId );
-    }
-    
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::EditL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettings::EditL( CWPASecuritySettingsUi& aUi,
-                                           const TDesC& aTitle )
-    {
-    return aUi.iImpl->EditL( *iImpl, aTitle );
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::DeleteL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::DeleteL( TUint32 aIapId ) const
-    {
-    iImpl->DeleteL( aIapId );
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::IsValid
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CWPASecuritySettings::IsValid() const
-    {
-    return iImpl->IsValid();
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::SetWPAPreSharedKey
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettings::SetWPAPreSharedKey( 
-                                                const TDesC& aPreSharedKey )
-    {
-    return iImpl->SetWPAPreSharedKey( aPreSharedKey );
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::LoadL( TUint32 aIapId, 
-                                           CMDBSession& aSession )
-    {
-    iImpl->LoadL( aIapId, aSession );
-    iImpl->SetIapId( aIapId );
-    }
-    
-    
-// ---------------------------------------------------------
-// CWPASecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::SaveL( TUint32 aIapId,
-                                           CMDBSession& aSession,
-                                           TTypeOfSaving aTypeOfSaving,
-                                           TUint32 aOldIapId ) const
-    {
-    iImpl->SaveL( aIapId, aSession, aTypeOfSaving, aOldIapId );
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettings::SetWPAEnabledEAPPlugin( 
-                                            const TDesC8& aEnabledPluginList )
-    {
-    return iImpl->SetWPAEnabledEAPPlugin( aEnabledPluginList );
-    }
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettings::SetWPADisabledEAPPlugin( 
-                                            const TDesC8& aDisabledPluginList )
-    {
-    return iImpl->SetWPADisabledEAPPlugin( aDisabledPluginList );
-    }
-        
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsDlg.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1034 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of dialog.  
-*
-*/
-
-/*
-* %version: tr1cfwln#31.1.1 %
-*/
-
-// INCLUDE FILES
-#include "WPASecuritySettingsDlg.h"
-#include "WPASecuritySettingsUiPanic.h"
-
-#include "WPASecuritySettingsUI.hrh"
-
-#include "WPASecuritySettingsDefs.h"
-
-#include <hlplch.h>
-
-#include <featmgr.h>
-
-#include <akntitle.h>
-#include <aknradiobuttonsettingpage.h>
-#include <StringLoader.h>
-#include <aknnotewrappers.h>
-#include <akntextsettingpage.h>
-#include <EAPPluginConfigurationIf.h>
-
-#include <WPASecuritySettingsUI.rsg>
-
-
-// CONSTANT DECLARATIONS
-
-// Number of fields of main view
-LOCAL_D const TInt KNumOfFieldsMain = 3;     
-
-// Menu List item format
-_LIT( KTxtMenuListItemFormat, " \t%S\t\t" ); 
-
-// Number of spaces and tabs in KTxtMenuListItemFormat string
-LOCAL_D const TInt KSpaceAndTabsLength = 4;  
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::CWPASecuritySettingsDlg
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsDlg::CWPASecuritySettingsDlg( TInt& aEventStore, 
-                                          const TUint32 aIapId,
-                                          CEAPPluginConfigurationIf* aPlugin )
-: iEventStore( &aEventStore ),
-  iIapId( aIapId ),
-  iPlugin( aPlugin )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::~CWPASecuritySettingsDlg
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsDlg::~CWPASecuritySettingsDlg()
-    {
-    if ( iTitlePane )
-        {
-        // set old text back, if we have it...
-        if ( iOldTitleText )
-            {
-            TRAP_IGNORE( iTitlePane->SetTextL( *iOldTitleText ) );
-            delete iOldTitleText;
-            }
-        }
-    
-    FeatureManager::UnInitializeLib();
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::NewL
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsDlg* CWPASecuritySettingsDlg::NewL( TInt& aEventStore, 
-                                        const TUint32 aIapId,
-                                        CEAPPluginConfigurationIf* aPlugin )
-    {
-    CWPASecuritySettingsDlg* secSett = new ( ELeave )CWPASecuritySettingsDlg(
-                                                aEventStore, aIapId, aPlugin );
-    return secSett;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::ConstructAndRunLD
-// ---------------------------------------------------------
-//
-TInt CWPASecuritySettingsDlg::ConstructAndRunLD( 
-                                CWPASecuritySettingsImpl* aSecuritySettings,
-                                const TDesC& aTitle )
-    {
-	CleanupStack::PushL( this );
-
-    const TInt Titles_Wpa_Main[KNumOfFieldsMain+1] =
-        {
-        R_WPA_MODE,
-        R_WPA_EAP_CONFIG,
-        R_WPA_MODE_PRESHARED_KEY,
-        R_WPA_TKIP_CIPHER
-        };
-
-    const TInt Fields_Wpa_Main[KNumOfFieldsMain+1] =
-        {
-        EWpaMode,
-        EWpaEapConfig,
-        EWpaPreSharedKey,
-        EWpaWpa2Only
-        };
-
-    iSecuritySettings = aSecuritySettings;
-    iConnectionName = aTitle;
-
-    iFieldsMain = ( TWpaMember* ) Fields_Wpa_Main;
-    iTitlesMain = MUTABLE_CAST( TInt*, Titles_Wpa_Main );
-
-    if ( !iSecuritySettings->WPAMode() && !iPlugin )
-        {
-        iSecuritySettings->SetWPAMode( ETrue );
-        *iEventStore |= CWPASecuritySettings::EModified;
-        }
-
-    FeatureManager::InitializeLibL();
-
-    ConstructL( R_WPA_SECURITY_SETTINGS_MENUBAR );
-    
-    // ExecuteLD will PushL( this ), so we have to Pop it...
-    CleanupStack::Pop( this ); // this
-	
-    return ExecuteLD( R_WPASETTINGS_DIALOG );
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::OkToExitL
-// ---------------------------------------------------------
-//
-TBool CWPASecuritySettingsDlg::OkToExitL( TInt aButtonId )
-    {
-    // Translate the button presses into commands for the appui & current
-    // view to handle
-    TBool retval( EFalse );
-    if ( aButtonId == EAknSoftkeyOptions )
-        {
-        DisplayMenuL();
-        }
-    else if ( aButtonId == EEikCmdExit )        // ShutDown requested
-        {
-        *iEventStore |= CWPASecuritySettings::EShutDownReq;
-        retval = ETrue;
-        }
-    else if ( aButtonId == EAknSoftkeyBack || aButtonId == EAknCmdExit )
-        {
-        if ( iSecuritySettings->WPAMode() )
-            {
-            if ( iSecuritySettings->IsValid() ) 
-                {
-                *iEventStore |= CWPASecuritySettings::EValid;
-                retval = ETrue;
-                }
-            else if ( aButtonId == EAknSoftkeyBack )
-                {
-                HBufC* stringHolder = StringLoader::LoadL(
-                                R_WPA_PRESHARED_KEYDATA_MISSING, iEikonEnv );
-                CleanupStack::PushL( stringHolder );
-
-                CAknQueryDialog *queryDialog = new (ELeave) CAknQueryDialog();
-
-                queryDialog->PrepareLC( R_WPA_SEC_SETT_CONF_QUERY );
-                queryDialog->SetPromptL( stringHolder->Des() );
-                retval = queryDialog->RunLD();
-
-                CleanupStack::PopAndDestroy( stringHolder );   // stringHolder
-                }
-            else
-                {
-                retval = ETrue;
-                }
-            }
-        else 
-            {
-            *iEventStore |= CWPASecuritySettings::EValid;
-            retval = ETrue;
-            }
-
-        if ( aButtonId == EAknCmdExit )
-            {
-            *iEventStore |= CWPASecuritySettings::EExitReq;
-            }
-        }
-    
-    else if( aButtonId == EWpaSelCmdChange )
-        {
-        ChangeSettingsL( ETrue );
-        retval = EFalse; // don't exit the dialog
-        }
-
-    return retval;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::OfferKeyEventL
-// ---------------------------------------------------------
-//
-TKeyResponse CWPASecuritySettingsDlg::OfferKeyEventL( 
-                                const TKeyEvent& aKeyEvent, TEventCode aType )
-    {
-    TKeyResponse retval( EKeyWasNotConsumed );
-
-    // Only interested in standard key events
-    if ( aType == EEventKey )
-        {
-        // If a menu is showing offer key events to it.
-        if ( CAknDialog::MenuShowing() )
-            {
-            retval = CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-            }
-        else
-            {
-            if ( iList )
-                {
-                // as list IS consuming, must handle because it IS the SHUTDOWN...
-                // or, a view switch is shutting us down...
-                if ( aKeyEvent.iCode == EKeyEscape )
-                    {
-                    ProcessCommandL( EEikCmdExit );
-                    retval = EKeyWasConsumed;
-                    }
-                else
-                    {
-                    retval = iList->OfferKeyEventL( aKeyEvent, aType );
-                    if ( *iEventStore & CWPASecuritySettings::EShutDownReq )
-                        {
-                        ProcessCommandL( EEikCmdExit );
-                        }
-                    else if ( *iEventStore & CWPASecuritySettings::EExitReq )
-                        {
-                        ProcessCommandL( EAknCmdExit );
-                        }
-                    }
-                }
-            else
-                {
-                if ( aKeyEvent.iCode == EKeyOK )
-                    {
-                    ProcessCommandL( EWpaSelCmdChange );
-                    retval = EKeyWasConsumed;
-                    }
-                }
-            }
-        }
-
-    return retval;
-    }
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::HandleDialogPageEventL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::HandleDialogPageEventL( TInt aEventID )
-    {
-     CAknDialog::HandleDialogPageEventL( aEventID );
-         if( *iEventStore & CWPASecuritySettings::EExitReq )
-             {        
-             // Exit requested, exit with EAknCmdExit. 
-             TryExitL( EAknCmdExit );
-             }   
-
-     }
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::HandleListboxDataChangeL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::HandleListboxDataChangeL()
-    {
-    // fill up our new list with data
-    CDesCArrayFlat* itemArray = new ( ELeave ) CDesCArrayFlat( 4 );
-    CleanupStack::PushL( itemArray );
-
-    FillListWithDataL( *itemArray, *iFieldsMain, iTitlesMain );
-
-    iList->Model()->SetItemTextArray( itemArray );
-
-    CleanupStack::Pop( itemArray ); // now it is owned by the LB, so pop it
-    iItemArray = itemArray;
-
-    iList->HandleItemAdditionL();
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::ProcessCommandL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::ProcessCommandL( TInt aCommandId )
-    {
-    if ( MenuShowing() )
-        {
-        HideMenu();
-        }
-
-    switch ( aCommandId )
-        {
-        case EWpaSelCmdChange:
-            {
-            ChangeSettingsL( EFalse );
-            break;
-            }
-
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iEikonEnv->WsSession(),
-                                    iEikonEnv->EikAppUi()->AppHelpContextL() );
-            break;
-            }
-
-        case EAknSoftkeyBack:
-        case EAknCmdExit:
-        case EEikCmdExit:
-            {
-            TryExitL( aCommandId );
-            break;
-            }
-
-        default:
-            {
-            // silently ignore it
-            break;
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::HandleListBoxEventL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                                   TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            ChangeSettingsL( ETrue );
-            break;
-            }
-
-        case EEventEditingStarted:
-        case EEventEditingStopped:
-        case EEventPenDownOnItem:
-        case EEventItemDraggingActioned:
-            {
-            break;
-            }
-
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EUnknownCase ) );
-            break;
-            };
-        };
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::PreLayoutDynInitL()
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::PreLayoutDynInitL()
-    {
-    // first get StatusPane
-    CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
-
-    // then get TitlePane
-    iTitlePane = ( CAknTitlePane* ) statusPane->ControlL( TUid::Uid( 
-                                                    EEikStatusPaneUidTitle ) );
-    // if not already stored, store it for restoring
-    if ( !iOldTitleText )
-        {
-        iOldTitleText = iTitlePane->Text()->AllocL();
-        }
-
-    // set new titlepane text
-    iTitlePane->SetTextL( iConnectionName );
-
-    iList = STATIC_CAST( CAknSettingStyleListBox*, 
-                                        Control( KWpaMainSettingsListboxId ) );
-
-    iList->CreateScrollBarFrameL( ETrue );
-    iList->ScrollBarFrame()->SetScrollBarVisibilityL
-        ( CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto );
-
-    HandleListboxDataChangeL();
-
-    iList->SetCurrentItemIndex( 0 );
-    iList->SetListBoxObserver( this );
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::DynInitMenuPaneL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::DynInitMenuPaneL( TInt aResourceId, 
-                                                CEikMenuPane* aMenuPane )
-    {
-    CAknDialog::DynInitMenuPaneL( aResourceId, aMenuPane );
-    if ( aResourceId == R_WPA_SECURITY_SETTINGS_MENU )
-        {
-        if ( aMenuPane && !FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
-            aMenuPane->DeleteMenuItem( EAknCmdHelp );
-            }
-        }
-    }
-
-
-//----------------------------------------------------------
-// CWPASecuritySettingsDlg::FillListWithDataL
-//----------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::FillListWithDataL( CDesCArrayFlat& aItemArray,
-                                                 const TWpaMember& arr, 
-                                                 const TInt* aRes )
-    {
-    TWpaMember* wpaMember = MUTABLE_CAST( TWpaMember*, &arr );
-
-    TInt numOfFields = iSecuritySettings->SecurityMode() == ESecurityModeWpa ? 
-                                        KNumOfFieldsMain : KNumOfFieldsMain-1;
-
-    for( TInt i = 0; i < numOfFields; i++ )
-        {
-        if ( *wpaMember == EWpaEapConfig && iSecuritySettings->WPAMode() )
-            {
-            wpaMember++;
-            aRes++;
-            }
-            
-        if ( *wpaMember == EWpaEapConfig )
-            {
-            // Define a heap descriptor to hold all the item text
-            // HBufC is non-modifiable
-            HBufC* title = iEikonEnv->AllocReadResourceLC( *aRes );
-
-            // Define a heap descriptor to hold all the item text
-            HBufC* itemText = HBufC::NewLC( title->Length() + 
-                                            KSpaceAndTabsLength );
-
-            // Define a modifiable pointer descriptor to be able to append
-            // text to the non-modifiable heap descriptor itemText
-            TPtr itemTextPtr = itemText->Des();
-            itemTextPtr.Format( KTxtMenuListItemFormat, title );
-
-            aItemArray.AppendL( *itemText );
-
-            CleanupStack::PopAndDestroy( 2, title );   // itemText, title
-            
-            wpaMember++;
-            aRes++;
-            }
-        else            // EWpaMode, EWpaPreSharedKey, EWpaWpa2Only:
-            {
-            HBufC* itemText = CreateTextualListBoxItemL( *wpaMember, *aRes );
-            CleanupStack::PushL( itemText );
-            aItemArray.AppendL( itemText->Des() );
-            CleanupStack::PopAndDestroy( itemText );
-            }
-
-        wpaMember++;
-        aRes++;
-        }
-    }
-
-
-//----------------------------------------------------------
-// CWPASecuritySettingsDlg::UpdateTextualListBoxItemL
-//----------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::UpdateTextualListBoxItemL( TWpaMember aMember,
-                                                         TInt aRes, TInt aPos )
-    {
-    HBufC* itemText;
-    HBufC* title;
-
-    if ( aMember == EWpaEapConfig )
-        {
-        title = iEikonEnv->AllocReadResourceLC( aRes );
-
-        // Define a heap descriptor to hold all the item text
-        itemText = HBufC::NewLC( title->Length() + KSpaceAndTabsLength );
-
-        // Define a modifiable pointer descriptor to be able to append
-        // text to the non-modifiable heap descriptor itemText
-        TPtr itemTextPtr = itemText->Des();
-        itemTextPtr.Format( KTxtMenuListItemFormat, title );
-        }
-    else
-        {
-        itemText = CreateTextualListBoxItemL( aMember, aRes );
-        CleanupStack::PushL( itemText );
-        }
-
-    // first try to add, if Leaves, list will be untouched
-    iItemArray->InsertL( aPos, itemText->Des() );
-    // if successful, previous item is scrolled up with one,
-    // so delete that one...
-    if ( ++aPos < iItemArray->MdcaCount() )
-        {
-        iItemArray->Delete( aPos );
-        }
-
-    CleanupStack::PopAndDestroy( itemText );
-
-    if ( aMember == EWpaEapConfig )
-        {
-        CleanupStack::PopAndDestroy( title );   // title
-        }
-    }
-
-
-//----------------------------------------------------------
-// CWPASecuritySettingsDlg::CreateTextualListBoxItemL
-//----------------------------------------------------------
-//
-HBufC* CWPASecuritySettingsDlg::CreateTextualListBoxItemL( TWpaMember aMember,
-                                                           TInt aRes )
-    {
-    // Define a heap descriptor to hold all the item text
-    // HBufC is non-modifiable
-    HBufC* title = iEikonEnv->AllocReadResourceLC( aRes );
-
-    // both variables needed independently of the following conditions so I
-    // must declare them here...
-    HBufC16* value;
-    TUint32 valueResourceID;
-
-    switch ( aMember )
-        {
-        case EWpaMode:
-            {
-            valueResourceID = iSecuritySettings->WPAMode() ?
-                              R_WPA_MODE_PRESHARED_KEY : R_WPA_MODE_EAP;
-            break;
-            }
-        
-        case EWpaWpa2Only:
-            {
-            valueResourceID = iSecuritySettings->Wpa2Only() ?
-                              R_WPA_CIPHER_NOT_ALLOWED : R_WPA_CIPHER_ALLOWED;
-            break;
-            }
-
-        case EWpaPreSharedKey:
-            {
-            valueResourceID = 
-                        iSecuritySettings->WPAPreSharedKey()->Length() == 0 ?
-                        R_WPA_PRESHARED_KEY_MUST_BE_DEFINED : 0;
-
-            break;
-            }
-
-        default:
-            {
-            valueResourceID = 0;
-            break;
-            }
-        }
-
-    _LIT( KStars, "****" );
-    _LIT( KTxtListItemFormat, " \t%S\t\t%S" );
-    _LIT( KTxtCompulsory, "\t*" );
-
-    if ( valueResourceID )
-        {
-        // Read up value text from resource
-        value = iEikonEnv->AllocReadResourceLC( valueResourceID );
-        }
-    else
-        {
-        value = HBufC::NewLC( KStars().Length() );
-        value->Des().Copy( KStars ); 
-        }
-
-    // Define a heap descriptor to hold all the item text
-    // +4 for space and tab characters
-    TInt length = title->Length() + value->Length() + KSpaceAndTabsLength;    
-    if ( aMember == EWpaPreSharedKey )  // Compulsory
-        {
-        length += KTxtCompulsory().Length();
-        }
-
-    HBufC* itemText = HBufC::NewLC( length );
-
-    // Define a modifiable pointer descriptor to be able to append text to the
-    // non-modifiable heap descriptor itemText
-    TPtr itemTextPtr = itemText->Des();
-    itemTextPtr.Format( KTxtListItemFormat, title, value );
-    if ( aMember == EWpaPreSharedKey )  // Compulsory
-        {
-        itemTextPtr.Append( KTxtCompulsory );
-        }
-    CleanupStack::Pop( itemText );    // itemtext,
-
-    CleanupStack::PopAndDestroy( 2 ); // title, value
-
-    return itemText;
-    }
-
-
-
-//----------------------------------------------------------
-// CWPASecuritySettingsDlg::ShowPopupSettingPageL
-//----------------------------------------------------------
-//
-TBool CWPASecuritySettingsDlg::ShowPopupSettingPageL( TWpaMember aData )
-    {
-    TInt currvalue( 0 );
-    TBool retval( EFalse );
-    CDesCArrayFlat* items = FillPopupSettingPageLC( aData,  currvalue );
-
-    TInt attr_resid = aData == EWpaMode ? R_WPA_MODE : R_WPA_TKIP_CIPHER;
-
-    HBufC* titlebuf = iEikonEnv->AllocReadResourceLC( attr_resid );
-    CAknRadioButtonSettingPage* dlg = new ( ELeave )CAknRadioButtonSettingPage(
-                            R_RADIO_BUTTON_SETTING_PAGE, currvalue, items );
-    CleanupStack::PushL( dlg ); 
-    TPtrC ptr( titlebuf->Des() );
-    dlg->SetSettingTextL( ptr );
-    CleanupStack::Pop( dlg ); // dlg
-        
-    if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenAccepted ) )
-        {
-    	retval = UpdateFromPopupSettingPage( aData, ( TBool )currvalue );
-	    }
-
-    CleanupStack::PopAndDestroy( titlebuf );
-    CleanupStack::PopAndDestroy( items );   // items. It deletes also all 
-                                            // elements in the array.
-    return retval;
-    }
-
-
-
-//----------------------------------------------------------
-// CWPASecuritySettingsDlg::ShowPopupTextSettingPageL
-//----------------------------------------------------------
-//
-TBool CWPASecuritySettingsDlg::ShowPopupTextSettingPageL()
-    {
-    TBool retval( EFalse );
-
-    HBufC16* bufKeyData = HBufC16::NewLC( EMaxLengthOfPreSharedKey );
-    TPtr16 ptrKeyData( bufKeyData->Des() );
-
-    TBool showPage( ETrue );
-    while ( showPage )
-        {
-        CAknTextSettingPage* settingPage = 
-                new( ELeave )CAknTextSettingPage( R_TEXT_SETTING_PAGE_KEY_DATA,
-                ptrKeyData, EAknSettingPageNoOrdinalDisplayed );
-
-        if ( settingPage->ExecuteLD( CAknSettingPage::EUpdateWhenAccepted ) )
-            {
-            HBufC8* buf8 = HBufC8::NewLC( bufKeyData->Des().Length() );
-            buf8->Des().Copy( bufKeyData->Des() ); 
-
-            if ( bufKeyData->Des().Length() < EMinLengthOfPreSharedKeyAscii )
-                {
-                HBufC* stringLabel;
-                
-                stringLabel = StringLoader::LoadL( 
-                                                R_INFO_PRESHARED_KEY_TOO_SHORT,
-                                                iEikonEnv );
-
-                CleanupStack::PushL( stringLabel );
-
-	            CAknInformationNote* dialog = new ( ELeave )
-                                                CAknInformationNote( ETrue );
-	            dialog->ExecuteLD( *stringLabel );
-
-                CleanupStack::PopAndDestroy( stringLabel );   // stringLabel
-
-                ptrKeyData.Zero();
-                }
-            else
-                {
-                if ( iSecuritySettings->SetWPAPreSharedKey( ptrKeyData ) != 
-                                                                     KErrNone )
-                    {
-                    HBufC* stringLabel;
-                    stringLabel = StringLoader::LoadL( 
-                                                R_INFO_PRESHARED_KEY_NOT_HEX );
-                    CleanupStack::PushL( stringLabel );
-
-    	            CAknInformationNote* dialog = new ( ELeave )
-                                                  CAknInformationNote( ETrue );
-                    CleanupStack::Pop( stringLabel );
-                    	
-      	            dialog->ExecuteLD( *stringLabel );
-      	            
-                    delete stringLabel;
-                    }
-                else
-                    {
-                    retval = ETrue;
-                    showPage = EFalse;
-                    }
-
-                }
-
-            CleanupStack::PopAndDestroy( buf8 ); // buf8
-            }
-        else
-            {
-            showPage = EFalse;
-            }
-        }
-
-    CleanupStack::PopAndDestroy( bufKeyData ); // bufKeyData
-
-    return retval;
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::FillPopupSettingPageLC
-// ---------------------------------------------------------
-//
-CDesCArrayFlat* CWPASecuritySettingsDlg::FillPopupSettingPageLC( 
-                                                            TWpaMember aData,
-                                                            TInt& aCurrvalue )
-    {
-    CDesCArrayFlat* items = new( ELeave)CDesCArrayFlat( 1 );
-    CleanupStack::PushL( items );
-
-    if ( aData == EWpaMode )
-        {
-        if ( iPlugin )
-            {
-            aCurrvalue = iSecuritySettings->WPAMode();
-
-            items->AppendL( *iEikonEnv->AllocReadResourceLC( R_WPA_MODE_EAP ) );
-            CleanupStack::PopAndDestroy();
-            }
-        else
-            {
-            aCurrvalue = 0;
-            }
-
-        items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                                R_WPA_MODE_PRESHARED_KEY ) );
-        CleanupStack::PopAndDestroy();
-        }
-    else        // EWpaWpa2Only:
-        {
-        items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                                R_WPA_CIPHER_ALLOWED ) );
-        CleanupStack::PopAndDestroy();
-        items->AppendL( *iEikonEnv->AllocReadResourceLC( 
-                                                R_WPA_CIPHER_NOT_ALLOWED ) );
-        CleanupStack::PopAndDestroy();
-
-        aCurrvalue = iSecuritySettings->Wpa2Only();
-        }
-
-    return items;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::UpdateFromPopupSettingPage
-// ---------------------------------------------------------
-//
-TBool CWPASecuritySettingsDlg::UpdateFromPopupSettingPage( TWpaMember aData,
-                                                           TBool aCurrvalue )
-    {
-    TBool retVal( EFalse );
-
-    if ( aData == EWpaMode )
-        {
-        if ( !iPlugin )
-            {
-            aCurrvalue = ETrue;
-            }
-
-        if ( iSecuritySettings->WPAMode() != aCurrvalue )
-            {
-            iSecuritySettings->SetWPAMode( aCurrvalue );
-            retVal = ETrue;
-            }
-        }
-    else        // EWpaWpa2Only:
-        {
-        if ( iSecuritySettings->Wpa2Only() != aCurrvalue )
-            {   
-            iSecuritySettings->SetWpa2Only( aCurrvalue );
-            retVal = ETrue;
-            }
-        }
-
-    return retVal;
-    }
-
-
-
-
-//----------------------------------------------------------
-// CWPASecuritySettingsDlg::ChangeSettingsL
-//----------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::ResetEapConfigFlag( TAny* aPtr )
-    {
-    CWPASecuritySettingsDlg* self = 
-                         static_cast<CWPASecuritySettingsDlg*>( aPtr );
-                         
-    self->iEapConfigActive = EFalse;
-    }
-
-
-//----------------------------------------------------------
-// CWPASecuritySettingsDlg::ChangeSettingsL
-//----------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::ChangeSettingsL( TBool aQuick )
-    {
-    TInt itemIndex;
-    TInt shift;
-
-    itemIndex = ( Max( iList->CurrentItemIndex(), 0 ) );
-
-    shift = ( itemIndex >= EWpaWpa2Only || 
-              ( itemIndex == EWpaEapConfig && 
-                iSecuritySettings->WPAMode() ) ) ? 1 : 0;
-
-    TWpaMember* ptr = iFieldsMain + itemIndex + shift;
-    TInt* titPtr = iTitlesMain + itemIndex + shift;
-
-    switch ( *ptr  )
-        {
-        case EWpaMode:
-            { // Pop-up setting item
-            TBool changed( ETrue );
-            if ( aQuick )
-                {
-                if ( iPlugin )
-                    {
-                    iSecuritySettings->SetWPAMode( 
-                                            !iSecuritySettings->WPAMode() );
-                    }
-                else
-                    {
-                    changed = EFalse;
-                    }
-                }
-            else
-                {
-                changed = ShowPopupSettingPageL( EWpaMode );
-                }
-
-            if ( changed )
-                {
-                UpdateTextualListBoxItemL( *ptr, *titPtr, itemIndex );
-                *iEventStore |= CWPASecuritySettings::EModified;
-
-                TInt shiftItem = iSecuritySettings->WPAMode() ? 2 : 1;
-
-                ptr += shiftItem;
-                titPtr += shiftItem;
-
-                UpdateTextualListBoxItemL( *ptr, *titPtr, itemIndex+1 );
-                iList->SetCurrentItemIndexAndDraw( itemIndex+1 );
-                }
-            break;
-            }
-
-        case EWpaWpa2Only:
-            { // Setting item with two available values
-            TBool changed( ETrue );
-            if ( aQuick )
-                {
-                iSecuritySettings->SetWpa2Only( 
-                                            !iSecuritySettings->Wpa2Only() );
-                }
-            else
-                {
-                changed = ShowPopupSettingPageL( EWpaWpa2Only );
-                }
-
-            if ( changed )
-                {
-                UpdateTextualListBoxItemL( *ptr, *titPtr, itemIndex );
-                *iEventStore |= CWPASecuritySettings::EModified;
-                }
-            break;
-            }
-
-        case EWpaPreSharedKey:
-            { // Text setting item
-            if ( ShowPopupTextSettingPageL() )
-                {
-                UpdateTextualListBoxItemL( *ptr, *titPtr, itemIndex );
-                *iEventStore |= CWPASecuritySettings::EModified;
-                }
-            break;
-            }
-
-        case EWpaEapConfig:
-            {
-            if ( iPlugin && !iEapConfigActive )
-                {
-                iEapConfigActive = ETrue;
-                CleanupStack::PushL( TCleanupItem( ResetEapConfigFlag, this ) );
-                
-
-                // using expanded EAP types
-                iEnabledPluginList = (
-                               iSecuritySettings->WPAEnabledEAPPlugin()? 
-                                    (TDesC8&)*iSecuritySettings->WPAEnabledEAPPlugin(): 
-                                    KNullDesC8 );
-                                    
-                iDisabledPluginList = (
-                               iSecuritySettings->WPADisabledEAPPlugin()?
-                                    (TDesC8&)*iSecuritySettings->WPADisabledEAPPlugin():
-                                    KNullDesC8 );
-
-                TInt buttonId = iPlugin->EAPPluginConfigurationL( 
-                                                     iEnabledPluginList, 
-                                                     iDisabledPluginList, 
-                                                     iIapId,
-                                                     iConnectionName );
-
-                CleanupStack::PopAndDestroy( 1 ); // ResetEapConfigFlag
-                
-                if ( buttonId == EEikCmdExit )        // ShutDown requested
-                    {
-                    *iEventStore |= CWPASecuritySettings::EShutDownReq;
-                    }
-                else if ( buttonId == EAknCmdExit )
-                    {
-                    *iEventStore |= CWPASecuritySettings::EExitReq;
-                    }
-
-                if ( !iSecuritySettings->WPAEnabledEAPPlugin() || 
-                     iEnabledPluginList != 
-                                    *iSecuritySettings->WPAEnabledEAPPlugin() )
-                    {
-                    User::LeaveIfError( 
-                        iSecuritySettings->SetWPAEnabledEAPPlugin( 
-                                                        iEnabledPluginList ) );
-                    *iEventStore |= CWPASecuritySettings::EModified;
-                    }
-    
-                if ( !iSecuritySettings->WPADisabledEAPPlugin() ||
-                     iDisabledPluginList != 
-                                   *iSecuritySettings->WPADisabledEAPPlugin() )
-                    {
-                    User::LeaveIfError( 
-                        iSecuritySettings->SetWPADisabledEAPPlugin( 
-                                                        iDisabledPluginList ) );
-                    *iEventStore |= CWPASecuritySettings::EModified;
-                    }
-
-                // If exiting from the menu, pass it on 
-                if( buttonId == EAknCmdExit )
-                    {
-                    if (aQuick == EFalse)
-                        {
-                            TryExitL( buttonId );
-                        }
-                        // Don't exit here if aQuick==ETrue. 
-                        // Framework command chain will
-                        // cause a KERN-EXEC 3 panic. Handle the exit in 
-                        // HandleDialogPageEventL(). 
-                    }
-                }
-            
-            return;
-            }
-
-
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EUnknownCase ) );
-            break;
-            }
-        }
-
-    iList->ScrollToMakeItemVisible( itemIndex );
-    iList->SetCurrentItemIndexAndDraw( itemIndex );
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsDlg::GetHelpContext
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsDlg::GetHelpContext( TCoeHelpContext& /* aContext */ ) const
-    {
-    // Avkon help dependencies removed, hence do nothing
-    return;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsImpl.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,808 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWPASecuritySettingsImpl.     
-*
-*/
-
-/*
-* %version: tr1cfwln#27 %
-*/
-
-// INCLUDE FILES
-
-#include "WPASecuritySettingsUiPanic.h"
-
-#include "WPASecuritySettingsUI.hrh"
-
-#include <WPASecuritySettingsUI.h>
-#include <commdb.h>
-#include <EAPPluginConfigurationIf.h>
-#include "WPASecuritySettingsImpl.h"
-
-#include <commsdattypesv1_1.h>
-#include <cmmanagertablefields.h>
-#include <wlancontainer.h>
-
-
-// CONSTANTS
-LOCAL_D const TUint32 KUidNone = 0;     // Invalid id
-LOCAL_D const TUint32 E8021X = 4;       // 802.1X security mode
-LOCAL_D const TUint32 EWpa = 8;         // Wpa security mode
-LOCAL_D const TUint32 EWpa2 = 16;       // Wpa2 only security mode
-
-LOCAL_D const TUint32 KExpEapTypeLength = 8;    // expanded EAP type length
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::NewL
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsImpl* CWPASecuritySettingsImpl::NewL( 
-                                                TSecurityMode aSecurityMode )
-    {
-    CWPASecuritySettingsImpl* settings = new ( ELeave ) 
-                                    CWPASecuritySettingsImpl( aSecurityMode );
-    CleanupStack::PushL( settings );
-    settings->ConstructL();
-    CleanupStack::Pop( settings ); 
-    return settings;    
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::CWPASecuritySettingsImpl
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsImpl::CWPASecuritySettingsImpl( 
-                                                TSecurityMode aSecurityMode )
-: iSecurityMode( aSecurityMode ),
-  iWPAMode( EFalse ),
-  iWpa2Only( EFalse )
-    {
-    iWPAEAPPlugin.Zero();
-    iWPAPreSharedKey.Zero();
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsImpl::ConstructL()
-    {
-    _LIT8( KMatchString, "EAPPConfig" );
-	TRAPD( err, iPlugin = CEAPPluginConfigurationIf::NewL( KMatchString ) );
-    if ( err != KErrNone && err != KEComErrNoInterfaceIdentified )
-        {
-        User::Leave( err );
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::~CWPASecuritySettingsImpl
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsImpl::~CWPASecuritySettingsImpl()
-    {
-    delete iWPAEnabledEAPPlugin;
-    delete iWPADisabledEAPPlugin;
-    delete iPlugin;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::LoadL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsImpl::LoadL( TUint32 aIapId, 
-                                      CCommsDatabase& aCommsDb )
-    {
-    if ( aIapId == KUidNone )
-        {
-        return;
-        }
-
-    CCommsDbTableView* wLanServiceTable;
-        
-    wLanServiceTable = aCommsDb.OpenViewMatchingUintLC(
-                    TPtrC( WLAN_SERVICE ), TPtrC( WLAN_SERVICE_ID ), aIapId );
-
-    TInt errorCode = wLanServiceTable->GotoFirstRecord();
-    if ( errorCode == KErrNone )
-        {
-        // Get WPA Mode
-        TRAPD( err, wLanServiceTable->ReadUintL( TPtrC( WLAN_ENABLE_WPA_PSK ),
-                                                ( TUint32& ) iWPAMode ) );
-        if ( err != KErrNone )
-            { // do not leave if value is not present in table...
-            if ( err != KErrUnknown )
-                User::Leave( err );
-            }
-
-        TUint32 secMode = 0;
-        // Get WPA2 Only Mode
-        TRAP( err, wLanServiceTable->ReadUintL( TPtrC( WLAN_SECURITY_MODE ),
-                                                 secMode ) );
-        if ( err != KErrNone )
-            { // do not leave if value is not present in table...
-            if ( err != KErrUnknown )
-                User::Leave( err );
-            }
-
-        iWpa2Only = secMode == EWpa2;
-
-        // Get EAP list
-    	iWPAEAPPlugin.Copy( *wLanServiceTable->ReadLongTextLC( 
-                                                        TPtrC( WLAN_EAPS ) ) );
-	    CleanupStack::PopAndDestroy();
-	    
-	    if ( !iWPAEAPPlugin.Length() )
-	        {
-	        // no data found in the old column, use the new ones
-
-	        // enabled EAP types
-	        HBufC *data = wLanServiceTable->ReadLongTextLC( 
-	                                              TPtrC( WLAN_ENABLED_EAPS ) );
-
-            TPtrC8 reint( reinterpret_cast<const TUint8*>( data->Ptr() ), 
-	                                                       data->Size() );
-            
-        	delete iWPAEnabledEAPPlugin; iWPAEnabledEAPPlugin = NULL;
-        	iWPAEnabledEAPPlugin = reint.AllocL();
-
-            CleanupStack::PopAndDestroy( data );
-            
-            
-            // 2. disabled EAP types
-            data = wLanServiceTable->ReadLongTextLC( 
-	                                             TPtrC( WLAN_DISABLED_EAPS ) );
-            
-            reint.Set( reinterpret_cast<const TUint8*>( data->Ptr() ), 
-	                                                    data->Size() );
-	                                                    
-        	delete iWPADisabledEAPPlugin; iWPADisabledEAPPlugin = NULL;
-        	iWPADisabledEAPPlugin = reint.AllocL();
-
-	        CleanupStack::PopAndDestroy( data );
-	        }
-	    else
-	        {
-	        // generate appropriate entries in the new enabled and disabled list,
-	        // overwriting those values 
-	        
-	        // count the + and - signs to determine the size of enabled and 
-	        // disabled descriptors
-	        TLex lex( iWPAEAPPlugin );
-            
-	        TInt numPlus = 0;
-	        TInt numMinus = 0;
-	        TChar ch;
-	        while ( !lex.Eos() )
-	            {
-	            ch = lex.Get();
-	            if ( ch == '+' ) ++numPlus;
-	            else if ( ch == '-' ) ++numMinus;
-	            }
-	            
-            // each entry consumes 8 bytes in binary format
-            delete iWPAEnabledEAPPlugin; iWPAEnabledEAPPlugin = NULL;
-            iWPAEnabledEAPPlugin = HBufC8::NewL( 8 * numPlus );
-            
-            delete iWPADisabledEAPPlugin; iWPADisabledEAPPlugin = NULL;
-            iWPADisabledEAPPlugin = HBufC8::NewL( 8 * numMinus );
-
-            lex.Assign( iWPAEAPPlugin );
-            
-            while ( !lex.Eos() )
-                {
-                // beginning of implementation UID
-                TInt16 implUid = 0;
-                
-                if ( lex.Val( implUid ) != KErrNone || !implUid )
-                    {
-                    // if the old string is corrupted, null out both lists
-                    iWPAEnabledEAPPlugin->Des().Zero();
-                    iWPADisabledEAPPlugin->Des().Zero();
-                    break;
-                    }
-
-                // append it to the appropriate list ('+' enabled, '-' disabled)
-                _LIT8( KPadding, "\xFE\0\0\0\0\0\0" );
-                _LIT8( KMsChapV2Padding, "\xFE\xFF\xFF\xFF\0\0\0");
-                const TInt KPlainMsChapV2ImplUid = 99;
-                
-                if ( implUid > 0 )
-                    {
-                    iWPAEnabledEAPPlugin->Des().Append( 
-                                        Abs( implUid ) == KPlainMsChapV2ImplUid? 
-                                                    KMsChapV2Padding: KPadding );
-                    iWPAEnabledEAPPlugin->Des().Append( Abs( implUid ) );
-                    }
-                else if (implUid < 0 )
-                    {
-                    iWPADisabledEAPPlugin->Des().Append( 
-                                        Abs( implUid ) == KPlainMsChapV2ImplUid? 
-                                                    KMsChapV2Padding: KPadding );
-                    iWPADisabledEAPPlugin->Des().Append( Abs( implUid ) );
-                    }
-                
-                // swallow the delimiter (',')
-                lex.Get();
-                }
-                
-            // finally, wipe old column data
-            iWPAEAPPlugin.Zero();
-	        }
-	        
-        // Get PreShared Key
-        wLanServiceTable->ReadTextL( TPtrC( WLAN_WPA_PRE_SHARED_KEY ), 
-                                    iWPAPreSharedKey );
-
-        if ( !IsValidPsk( iWPAPreSharedKey ) )
-            {       
-            // invalid key format
-            iWPAPreSharedKey.Zero();
-            }
-        }
-
-    CleanupStack::PopAndDestroy( wLanServiceTable );  // wLanServiceTable
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SaveL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsImpl::SaveL( TUint32 aIapId, 
-                                      CCommsDatabase& aCommsDb,
-                                      TTypeOfSaving aTypeOfSaving,
-                                      TUint32 aOldIapId )
-    {
-    CCommsDbTableView* wLanServiceTable;
-
-    // Caller MUST initiate a transaction, WE WILL NOT.
-
-    wLanServiceTable = aCommsDb.OpenViewMatchingUintLC( 
-                    TPtrC( WLAN_SERVICE ), TPtrC( WLAN_SERVICE_ID ), aIapId );
-    TInt errorCode = wLanServiceTable->GotoFirstRecord();
-
-    if ( errorCode == KErrNone )
-        {
-        wLanServiceTable->UpdateRecord();
-        }
-    else
-        {
-        TUint32 dummyUid( KUidNone );
-        User::LeaveIfError( wLanServiceTable->InsertRecord( dummyUid ) );
-
-        // Save link to LAN service
-        wLanServiceTable->WriteUintL( TPtrC( WLAN_SERVICE_ID ), aIapId );
-        }
-
-    // Save WPA Mode
-    wLanServiceTable->WriteUintL( TPtrC( WLAN_ENABLE_WPA_PSK ), 
-                                  ( TUint32& ) iWPAMode );
-
-    TUint32 secMode;
-
-    if ( iSecurityMode == ESecurityMode8021x )
-        {
-        secMode = E8021X;
-        }
-    else if ( iWpa2Only )
-        {
-        secMode = EWpa2;
-        }
-    else
-        {
-        secMode = EWpa;
-        }
-
-    // Save security mode
-    wLanServiceTable->WriteUintL( TPtrC( WLAN_SECURITY_MODE ), secMode );
-
-    // With expanded EAP types allowed we no longer need the old column
-    iWPAEAPPlugin.Zero(); 
-
-    // Save EAP list
-    wLanServiceTable->WriteLongTextL( TPtrC( WLAN_EAPS ), iWPAEAPPlugin );
-
-
-    // Save the expanded EAPs
-    wLanServiceTable->WriteTextL( TPtrC( WLAN_ENABLED_EAPS ), 
-                                  iWPAEnabledEAPPlugin? 
-                                        (const TDesC8&)*iWPAEnabledEAPPlugin: 
-                                        (const TDesC8&)KNullDesC8 );
-
-    wLanServiceTable->WriteTextL( TPtrC( WLAN_DISABLED_EAPS ), 
-                                  iWPADisabledEAPPlugin? 
-                                        (const TDesC8&)*iWPADisabledEAPPlugin: 
-                                        (const TDesC8&)KNullDesC8 );
-    // Save PreShared Key
-    wLanServiceTable->WriteTextL( TPtrC( WLAN_WPA_PRE_SHARED_KEY ), 
-                                  iWPAPreSharedKey );
-
-    // Save PreShared Key Length
-    wLanServiceTable->WriteUintL( TPtrC( WLAN_WPA_KEY_LENGTH ), 
-                                  iWPAPreSharedKey.Length() );
-
-    wLanServiceTable->PutRecordChanges();
-
-    if ( iPlugin )
-        {
-        if ( aTypeOfSaving == ESavingBrandNewAP )
-            {
-            iPlugin->ChangeIapIDL( aOldIapId, aIapId );
-            }
-        else if ( aTypeOfSaving == ESavingNewAPAsACopy )
-            {
-            iPlugin->CopySettingsL( aOldIapId, aIapId );
-            }
-        }
-
-    CleanupStack::PopAndDestroy( wLanServiceTable );  // wLanServiceTable
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::DeleteL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsImpl::DeleteL( TUint32 aIapId )
-    {
-    if ( iPlugin )
-        {
-        iPlugin->DeleteSettingsL( aIapId );
-        }
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::IsValid
-// ---------------------------------------------------------
-//
-TBool CWPASecuritySettingsImpl::IsValid()
-    {
-    TBool retval = ETrue;
-    if ( iWPAMode || !iPlugin )
-        {
-        retval = IsValidPsk( iWPAPreSharedKey );
-        }
-
-    return retval;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::IsValidPsk
-// ---------------------------------------------------------
-//
-TBool CWPASecuritySettingsImpl::IsValidPsk( const TDesC8& aPsk )
-    {
-    TBool ret( EFalse );
-
-    TInt len = aPsk.Length();
-    
-    ret = ( len >= EMinLengthOfPreSharedKeyAscii && 
-            len <= EMaxLengthOfPreSharedKeyAscii );
-               
-    if ( !ret && len == ELengthOfPreSharedKeyHex )
-        {
-        // perhaps it is hex
-        ret = ETrue;
-        
-        for ( TInt i = 0; i < len; ++i )
-            {
-            TChar ch( aPsk[i] );
-            if ( !ch.IsHexDigit() )
-                {
-                // got a bad character
-                ret = EFalse;
-                break;
-                }
-            }
-        }
-    
-    return ret;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SetWPAPreSharedKey
-// ---------------------------------------------------------
-//
-TInt CWPASecuritySettingsImpl::SetWPAPreSharedKey( 
-                                                const TDesC& aPreSharedKey )
-    {
-    TInt ret( KErrNone );
-    
-    HBufC8* buf8 = HBufC8::New( aPreSharedKey.Length() );
-    
-    if ( buf8 )
-        {
-        TPtr8 pskPtr( buf8->Des() );
-        pskPtr.Copy( aPreSharedKey ); 
-
-        if ( IsValidPsk( pskPtr ) )
-            {
-            SetWPAPreSharedKey( pskPtr );
-            SetWPAMode( ETrue );
-            }
-        else
-            {
-            ret = KErrArgument;
-            }
-
-        delete buf8;
-        }
-    else
-        {
-        ret = KErrNoMemory;
-        }
-    
-    return ret;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SetWPAEnabledEAPPlugin
-// ---------------------------------------------------------
-//
-TInt CWPASecuritySettingsImpl::SetWPAEnabledEAPPlugin( 
-                                             const TDesC8& aEnabledPluginList )
-	{
-	delete iWPAEnabledEAPPlugin; iWPAEnabledEAPPlugin = NULL;
-
-    if ( aEnabledPluginList.Length() % KExpEapTypeLength )
-        {
-        // valid expanded EAP types occupy 8 bytes each
-        return KErrArgument;
-        }
-
-	if ( aEnabledPluginList.Length() )
-	    {
-	    iWPAEnabledEAPPlugin = aEnabledPluginList.Alloc();
-	    if ( !iWPAEnabledEAPPlugin )
-	        {
-	        return KErrNoMemory;
-	        }
-	    }
-	
-	return KErrNone;
-	}
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SetWPADisabledEAPPlugin
-// ---------------------------------------------------------
-//
-TInt CWPASecuritySettingsImpl::SetWPADisabledEAPPlugin( 
-                                            const TDesC8& aDisabledPluginList )
-	{
-	delete iWPADisabledEAPPlugin; iWPADisabledEAPPlugin = NULL;
-
-    if ( aDisabledPluginList.Length() % KExpEapTypeLength )
-        {
-        // valid expanded EAP types occupy 8 bytes each
-        return KErrArgument;
-        }
-        
-	if ( aDisabledPluginList.Length() )
-	    {
-	    iWPADisabledEAPPlugin = aDisabledPluginList.Alloc();
-	    if ( !iWPADisabledEAPPlugin )
-	        {
-	        return KErrNoMemory;
-	        }
-	    }
-	
-	return KErrNone;
-	}
-	
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::LoadL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsImpl::LoadL( TUint32 aIapId, 
-                                      CMDBSession& aSession )
-    {
-    if ( aIapId == KUidNone )
-        {
-        return;
-        }
-        
-    // Load WLAN service table        
-    // first get WLAN table id
-    CMDBGenericRecord* generic = static_cast<CMDBGenericRecord*>
-        ( CCDRecordBase::RecordFactoryL( 0 ) );
-    CleanupStack::PushL( generic );    
-    generic->InitializeL( TPtrC( WLAN_SERVICE ), NULL );
-    generic->LoadL( aSession );
-    TMDBElementId wlanTableId = generic->TableId();
-    
-    CMDBField<TUint32>* sidField = static_cast<CMDBField<TUint32>*>
-                             ( generic->GetFieldByIdL( KCDTIdWlanServiceId ) );
-                                    
-    // prime with service id                
-    *sidField = aIapId;
-
-    if( generic->FindL( aSession) )
-        {
-        // Get WPA mode
-        CMDBField<TUint>* enableWpaPskField = static_cast<CMDBField<TUint>*>
-                          ( generic->GetFieldByIdL( KCDTIdWlanEnableWpaPsk ) );
-        iWPAMode = *enableWpaPskField;
-        
-        // Get WPA2 Only Mode
-        CMDBField<TUint>* secModeField = static_cast<CMDBField<TUint>*>
-                               ( generic->GetFieldByIdL( KCDTIdWlanSecMode ) );
-        TUint32 secMode = *secModeField;
-        iWpa2Only = secMode == EWpa2;
-        
-        // Get EAP plugins
-        CMDBField<TDesC>* wlanEapsField = static_cast<CMDBField<TDesC>*>
-                                  ( generic->GetFieldByIdL( KCDTIdWlanEaps ) );
-        iWPAEAPPlugin = *wlanEapsField;
-        
-	    if ( !iWPAEAPPlugin.Length() )
-	        {
-	        // no data found in the old column, use the new ones
-
-	        // enabled EAP types
-            CMDBField<TDesC8>* wlanEnabledEapsField = 
-                          static_cast<CMDBField<TDesC8>*>
-                          ( generic->GetFieldByIdL( KCDTIdWlanEnabledEaps ) );
-
-        	delete iWPAEnabledEAPPlugin; iWPAEnabledEAPPlugin = NULL;
-        	iWPAEnabledEAPPlugin = 
-        	             ( ( const TDesC8& ) *wlanEnabledEapsField ).AllocL();
-
-            
-            // disabled EAP types
-            CMDBField<TDesC8>* wlanDisabledEapsField = 
-                          static_cast<CMDBField<TDesC8>*>
-                          ( generic->GetFieldByIdL( KCDTIdWlanDisabledEaps ) );
-            
-        	delete iWPADisabledEAPPlugin; iWPADisabledEAPPlugin = NULL;
-        	iWPADisabledEAPPlugin = 
-        	             ( ( const TDesC8& ) *wlanDisabledEapsField ).AllocL();
-
-	        }
-	    else
-	        {
-	        // generate appropriate entries in the new enabled and disabled list,
-	        // overwriting those values 
-	        
-	        // count the + and - signs to determine the size of enabled and 
-	        // disabled descriptors
-	        TLex lex( iWPAEAPPlugin );
-            
-	        TInt numPlus = 0;
-	        TInt numMinus = 0;
-	        TChar ch;
-	        while ( !lex.Eos() )
-	            {
-	            ch = lex.Get();
-	            if ( ch == '+' ) ++numPlus;
-	            else if ( ch == '-' ) ++numMinus;
-	            }
-	            
-            // each entry consumes 8 bytes in binary format
-            delete iWPAEnabledEAPPlugin; iWPAEnabledEAPPlugin = NULL;
-            iWPAEnabledEAPPlugin = HBufC8::NewL( 8 * numPlus );
-            
-            delete iWPADisabledEAPPlugin; iWPADisabledEAPPlugin = NULL;
-            iWPADisabledEAPPlugin = HBufC8::NewL( 8 * numMinus );
-
-            lex.Assign( iWPAEAPPlugin );
-            
-            while ( !lex.Eos() )
-                {
-                // beginning of implementation UID
-                TInt16 implUid = 0;
-                
-                if ( lex.Val( implUid ) != KErrNone || !implUid )
-                    {
-                    // if the old string is corrupted, null out both lists
-                    iWPAEnabledEAPPlugin->Des().Zero();
-                    iWPADisabledEAPPlugin->Des().Zero();
-                    break;
-                    }
-
-                // append it to the appropriate list ('+' enabled, '-' disabled)
-                _LIT8( KPadding, "\xFE\0\0\0\0\0\0" );
-                _LIT8( KMsChapV2Padding, "\xFE\xFF\xFF\xFF\0\0\0");
-                const TInt KPlainMsChapV2ImplUid = 99;
-                
-                if ( implUid > 0 )
-                    {
-                    iWPAEnabledEAPPlugin->Des().Append( 
-                                        Abs( implUid ) == KPlainMsChapV2ImplUid? 
-                                                    KMsChapV2Padding: KPadding );
-                    iWPAEnabledEAPPlugin->Des().Append( Abs( implUid ) );
-                    }
-                else if (implUid < 0 )
-                    {
-                    iWPADisabledEAPPlugin->Des().Append( 
-                                        Abs( implUid ) == KPlainMsChapV2ImplUid? 
-                                                    KMsChapV2Padding: KPadding );
-                    iWPADisabledEAPPlugin->Des().Append( Abs( implUid ) );
-                    }
-                
-                // swallow the delimiter (',')
-                lex.Get();
-                }
-                
-            // finally, wipe old column data
-            iWPAEAPPlugin.Zero();
-	        }
-
-        // GetWPA preshared key
-        CMDBField<TDesC8>* wpaPskField = static_cast<CMDBField<TDesC8>*>
-                       ( generic->GetFieldByIdL( KCDTIdWlanWpaPreSharedKey ) );
-        iWPAPreSharedKey = *wpaPskField;
-        
-        if ( !IsValidPsk( iWPAPreSharedKey ) )
-            {       
-            // invalid key format
-            iWPAPreSharedKey.Zero();
-            }
-        }
-    
-    CleanupStack::PopAndDestroy( generic );
-    }
-    
-    
-// ---------------------------------------------------------
-// CWPASecuritySettingsImpl::SaveL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsImpl::SaveL( TUint32 aIapId, 
-                                      CMDBSession& aSession,
-                                      TTypeOfSaving aTypeOfSaving,
-                                      TUint32 aOldIapId )
-    {
-    const TInt KRetryWait = 100000;    // Wait time between retries in TTimeIntervalMicroSeconds32
-    const TInt KRetryCount = 50;       // Max retry count
-
-    // Load WLAN service table
-    // first get WLAN table id
-    CMDBGenericRecord* generic = static_cast<CMDBGenericRecord*>
-        ( CCDRecordBase::RecordFactoryL( 0 ) );
-    CleanupStack::PushL( generic );    
-    generic->InitializeL( TPtrC( WLAN_SERVICE ), NULL );
-    generic->LoadL( aSession );
-    TMDBElementId wlanTableId = generic->TableId();
-    
-    CMDBField<TUint32>* sidField = static_cast<CMDBField<TUint32>*>
-                             ( generic->GetFieldByIdL( KCDTIdWlanServiceId ) );
-    
-    // prime with service id                
-    *sidField = aIapId;
-    
-    TBool found = generic->FindL( aSession);
-   
-    // If loading failed, WLAN service record will be 
-    // created and StoreL()-d, otherwise, ModifyL()
-    
-    // Set WPA mode
-    CMDBField<TUint>* enableWpaPskField = static_cast<CMDBField<TUint>*>
-                          ( generic->GetFieldByIdL( KCDTIdWlanEnableWpaPsk ) );
-    enableWpaPskField->SetL( iWPAMode );
-    
-    // Set security mode
-    TUint32 secMode;
-    if ( iSecurityMode == ESecurityMode8021x )
-        {
-        secMode = E8021X;
-        }
-    else if ( iWpa2Only )
-        {
-        secMode = EWpa2;
-        }
-    else
-        {
-        secMode = EWpa;
-        }
-    CMDBField<TUint>* secModeField = static_cast<CMDBField<TUint>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanSecMode ) );
-    secModeField->SetL( secMode );
-    
-    // Save EAP list
-    CMDBField<TDesC>* wlanEapsField = static_cast<CMDBField<TDesC>*>
-                                ( generic->GetFieldByIdL( KCDTIdWlanEaps ) );
-
-    // when using the expanded EAP types, wipe out data in the old column
-    iWPAEAPPlugin.Zero();
-
-    wlanEapsField->SetL( iWPAEAPPlugin );
-
-    // Save the expanded EAPs
-    CMDBField<TDesC8>* wlanEnabledEapsField = static_cast<CMDBField<TDesC8>*>
-                           ( generic->GetFieldByIdL( KCDTIdWlanEnabledEaps ) );
-    wlanEnabledEapsField->SetL( iWPAEnabledEAPPlugin? 
-                                    (const TDesC8&)*iWPAEnabledEAPPlugin: 
-                                    (const TDesC8&)KNullDesC8 );
-
-
-    CMDBField<TDesC8>* wlanDisabledEapsField = static_cast<CMDBField<TDesC8>*>
-                          ( generic->GetFieldByIdL( KCDTIdWlanDisabledEaps ) );
-    wlanDisabledEapsField->SetL( iWPADisabledEAPPlugin? 
-                                    (const TDesC8&)*iWPADisabledEAPPlugin: 
-                                    (const TDesC8&)KNullDesC8 );
-
-    // Save PreShared Key
-    CMDBField<TDesC8>* wpaPskField = static_cast<CMDBField<TDesC8>*>
-                       ( generic->GetFieldByIdL( KCDTIdWlanWpaPreSharedKey ) );
-    wpaPskField->SetL( iWPAPreSharedKey );
-
-    // Save PreShared Key length
-    CMDBField<TUint>* keyLengthField = static_cast<CMDBField<TUint>*>
-                        ( generic->GetFieldByIdL( KCDTIdWlanWpaKeyLength ) );
-    keyLengthField->SetL( iWPAPreSharedKey.Length() );
-    
-    TInt error( KErrNone );
-    
-    // Saving changes
-    for ( TInt i( 0 ); i < KRetryCount; i++ )
-        {
-        
-        // If table existed modify it
-        if( found )
-            {
-            TRAP( error, generic->ModifyL( aSession ) );
-            }
-                   
-        // Otherwise store a new record
-        else
-            {
-            generic->SetRecordId( KCDNewRecordRequest );
-            TRAP( error, generic->StoreL( aSession ) );
-            }
-                  
-        // If operation failed with KErrLocked, we'll retry.
-        if ( KErrLocked == error )
-            {
-            User::After( KRetryWait );
-            }
-        
-        // Otherwise break the retry loop.
-        else 
-            {
-            break;        
-            }
-        }
-    
-    // If the save operation failed, leave now. 
-    User::LeaveIfError( error );
-
-    CleanupStack::PopAndDestroy( generic );
-            
-    if ( iPlugin )
-        {
-        if ( aTypeOfSaving == ESavingBrandNewAP )
-            {
-            iPlugin->ChangeIapIDL( aOldIapId, aIapId );
-            }
-        else if ( aTypeOfSaving == ESavingNewAPAsACopy )
-            {
-            iPlugin->CopySettingsL( aOldIapId, aIapId );
-            }
-        }
-    }
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsUI.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWPASecuritySettingsUi.  
-*
-*/
-
-/*
-* %version: tr1cfwln#10 %
-*/
-
-// INCLUDE FILES
-#include "WPASecuritySettingsUiImpl.h"
-
-#include <WPASecuritySettingsUI.h>
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUi::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CWPASecuritySettingsUi* CWPASecuritySettingsUi::NewL( 
-                                                        CEikonEnv& aEikEnv )
-    {
-    CWPASecuritySettingsUi* secSett = new( ELeave )CWPASecuritySettingsUi;
-    CleanupStack::PushL( secSett );
-    secSett->iImpl = CWPASecuritySettingsUiImpl::NewL( aEikEnv );
-    CleanupStack::Pop( secSett ); // secSett
-    return secSett;
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUi::~CWPASecuritySettingsUi
-// ---------------------------------------------------------
-//
-EXPORT_C CWPASecuritySettingsUi::~CWPASecuritySettingsUi()
-    {
-    delete iImpl;
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUi::Cvt()
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettingsUi::Cvt()
-    {
-    return KErrNone;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsUiImpl.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of class CWPASecuritySettingsUiImpl. 
-*
-*/
-
-/*
-* %version: tr1cfwln#11 %
-*/
-
-// INCLUDE FILES
-#include "WPASecuritySettingsUiImpl.h"
-#include "WPASecuritySettingsDlg.h"
-#include "WPASecuritySettingsImpl.h"
-
-#include <bautils.h>
-#include <WPASecuritySettingsUI.h>
-
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-_LIT( KDriveZ, "z:" );                                    // ROM folder
-_LIT( KResourceFileName, "WPASecuritySettingsUI.rsc" );   // RSC file name.
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUiImpl::NewL
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsUiImpl* CWPASecuritySettingsUiImpl::NewL( 
-                                                        CEikonEnv& aEikEnv )
-    {
-    CWPASecuritySettingsUiImpl* uiImpl = 
-                        new( ELeave ) CWPASecuritySettingsUiImpl( aEikEnv );
-    CleanupStack::PushL( uiImpl );
-    uiImpl->ConstructL();
-    CleanupStack::Pop( uiImpl ); // uiImpl
-    return uiImpl;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUiImpl::CWPASecuritySettingsUiImpl
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsUiImpl::CWPASecuritySettingsUiImpl( CEikonEnv& aEikEnv )
-: iEventStore( ENone ), 
-  iEikEnv( &aEikEnv )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUiImpl::~CWPASecuritySettingsUiImpl
-// ---------------------------------------------------------
-//
-CWPASecuritySettingsUiImpl::~CWPASecuritySettingsUiImpl()
-    {
-    if ( iResOffset )
-        {
-        iEikEnv->DeleteResourceFile( iResOffset );
-        }
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUiImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CWPASecuritySettingsUiImpl::ConstructL()
-    {
-    TFileName fileName;
-
-    fileName.Append( KDriveZ );
-    fileName.Append( KDC_RESOURCE_FILES_DIR );
-    fileName.Append( KResourceFileName );
-
-    BaflUtils::NearestLanguageFile( iEikEnv->FsSession(), fileName );
-    iResOffset = iEikEnv->AddResourceFileL( fileName );
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUiImpl::EditL
-// ---------------------------------------------------------
-//
-TInt CWPASecuritySettingsUiImpl::EditL( CWPASecuritySettingsImpl& aSettings,
-                                        const TDesC& aTitle )
-    {
-    iEventStore = ENone;
-
-    CWPASecuritySettingsDlg* secSettDlg = 
-                        CWPASecuritySettingsDlg::NewL( iEventStore, 
-                                                       aSettings.IapId(), 
-                                                       aSettings.Plugin() );
-    secSettDlg->ConstructAndRunLD( &aSettings, aTitle );
-
-    return iEventStore;
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsUiPanic.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of panic function.     
-*
-*/
-
-/*
-* %version: tr1cfwln#8 %
-*/
-
-// INCLUDE FILES
-
-#include "WPASecuritySettingsUiPanic.h"
-
-#include <e32std.h>
-
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// Panic()
-// ---------------------------------------------------------
-//
-void Panic( TWpaSecuritySettingsPanicCodes aPanic )
-    {
-    _LIT( kWpaSet, "WPASecuritySettingsUi" );
-    User::Panic( kWpaSet, aPanic );
-    }
-
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/wpasecuritysettingsstub.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub implementation of class CWPASecuritySettings for 
-*              non-WLAN products to support linking 
-*
-*/
-
-/*
-* %version: 2 %
-*/
-
-// INCLUDE FILES
-#include <WPASecuritySettingsUI.h>
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CWPASecuritySettings* CWPASecuritySettings::NewL( 
-                                                TSecurityMode /*aSecurityMode*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::~CWPASecuritySettings
-// ---------------------------------------------------------
-//
-EXPORT_C CWPASecuritySettings::~CWPASecuritySettings()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::LoadL( TUint32 /*aIapId*/, 
-                                           CCommsDatabase& /*aCommsDb*/ )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::SaveL( TUint32 /*aIapId*/, 
-                                           CCommsDatabase& /*aCommsDb*/, 
-                                           TTypeOfSaving /*aTypeOfSaving*/, 
-                                           TUint32 /*aOldIapId*/ ) const
-    {
-    }
-    
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::EditL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettings::EditL( CWPASecuritySettingsUi& /*aUi*/,
-                                           const TDesC& /*aTitle*/ )
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::DeleteL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::DeleteL( TUint32 /*aIapId*/ ) const
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::IsValid
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CWPASecuritySettings::IsValid() const
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::SetWPAPreSharedKey
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettings::SetWPAPreSharedKey( 
-                                                const TDesC& /*aPreSharedKey*/ )
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::LoadL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::LoadL( TUint32 /*aIapId*/, 
-                                           CMDBSession& /*aSession*/ )
-    {
-    }
-    
-    
-// ---------------------------------------------------------
-// CWPASecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C void CWPASecuritySettings::SaveL( TUint32 /*aIapId*/,
-                                           CMDBSession& /*aSession*/,
-                                           TTypeOfSaving /*aTypeOfSaving*/,
-                                           TUint32 /*aOldIapId*/ ) const
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettings::SetWPAEnabledEAPPlugin( 
-                                            const TDesC8& /*aEnabledPluginList*/ )
-    {
-    return KErrNotSupported;
-    }
-
-// ---------------------------------------------------------
-// CWPASecuritySettings::SaveL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettings::SetWPADisabledEAPPlugin( 
-                                            const TDesC8& /*aDisabledPluginList*/ )
-    {
-    return KErrNotSupported;
-    }
-
-// End of File
--- a/wlansecuritysettings/wpasecuritysettingsui/src/wpasecuritysettingsuistub.cpp	Mon May 03 12:33:23 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Stub implementation of class CWPASecuritySettingsUi for 
-*              non-WLAN products to support linking 
-*
-*/
-
-/*
-* %version: 2 %
-*/
-
-// INCLUDE FILES
-#include <WPASecuritySettingsUI.h>
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUi::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CWPASecuritySettingsUi* CWPASecuritySettingsUi::NewL( 
-                                                        CEikonEnv& /*aEikEnv*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUi::~CWPASecuritySettingsUi
-// ---------------------------------------------------------
-//
-EXPORT_C CWPASecuritySettingsUi::~CWPASecuritySettingsUi()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CWPASecuritySettingsUi::Cvt()
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CWPASecuritySettingsUi::Cvt()
-    {
-    return KErrNotSupported;
-    }
-// End of File