summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp28
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp28
2 files changed, 26 insertions, 30 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 84e0bae..cc18fba 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -99,11 +99,11 @@ void WLANImp::parseSettingFile(){
}
}
- if(line.contains("KEY0="))
+ if(line.contains("#KEY0="))
keyLineEdit0->setText(line.mid(5, line.length()));
- if(line.contains("KEY1="))
+ if(line.contains("#KEY1="))
keyLineEdit1->setText(line.mid(5, line.length()));
- if(line.contains("KEY2="))
+ if(line.contains("#KEY2="))
keyLineEdit2->setText(line.mid(5, line.length()));
- if(line.contains("KEY3="))
+ if(line.contains("#KEY3="))
keyLineEdit3->setText(line.mid(5, line.length()));
@@ -166,5 +166,4 @@ void WLANImp::changeAndSaveSettingFile(){
stream << "\tESSID=any\n";
stream << "\tMODE=Managed\n";
- stream << "\tCHANNEL=6\n";
}
else{
@@ -174,8 +173,8 @@ void WLANImp::changeAndSaveSettingFile(){
}
- stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
- stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
- stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
- stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
+ stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
+ stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
+ stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
+ stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
if(wepEnabled->isChecked()){
@@ -209,12 +208,11 @@ void WLANImp::changeAndSaveSettingFile(){
void WLANImp::accept(){
if(wepEnabled->isChecked()){
- if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
- {
- QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
- return;
- }
+ if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
+ QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
+ return;
+ }
}
- if(essSpecificLineEdit->text().isEmpty()){
+ if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
return;
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 84e0bae..cc18fba 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -99,11 +99,11 @@ void WLANImp::parseSettingFile(){
}
}
- if(line.contains("KEY0="))
+ if(line.contains("#KEY0="))
keyLineEdit0->setText(line.mid(5, line.length()));
- if(line.contains("KEY1="))
+ if(line.contains("#KEY1="))
keyLineEdit1->setText(line.mid(5, line.length()));
- if(line.contains("KEY2="))
+ if(line.contains("#KEY2="))
keyLineEdit2->setText(line.mid(5, line.length()));
- if(line.contains("KEY3="))
+ if(line.contains("#KEY3="))
keyLineEdit3->setText(line.mid(5, line.length()));
@@ -166,5 +166,4 @@ void WLANImp::changeAndSaveSettingFile(){
stream << "\tESSID=any\n";
stream << "\tMODE=Managed\n";
- stream << "\tCHANNEL=6\n";
}
else{
@@ -174,8 +173,8 @@ void WLANImp::changeAndSaveSettingFile(){
}
- stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
- stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
- stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
- stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
+ stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
+ stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
+ stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
+ stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
if(wepEnabled->isChecked()){
@@ -209,12 +208,11 @@ void WLANImp::changeAndSaveSettingFile(){
void WLANImp::accept(){
if(wepEnabled->isChecked()){
- if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
- {
- QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
- return;
- }
+ if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
+ QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
+ return;
+ }
}
- if(essSpecificLineEdit->text().isEmpty()){
+ if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
return;