author | benmeyer <benmeyer> | 2002-11-22 20:51:13 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-11-22 20:51:13 (UTC) |
commit | 6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4 (patch) (unidiff) | |
tree | 7e82db5619848bdb53382931fbb5b9a05030f3c0 | |
parent | 0dc2fdfc84bfd9d1d0021968ffc7406bdad54a40 (diff) | |
download | opie-6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4.zip opie-6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4.tar.gz opie-6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4.tar.bz2 |
In theory open and restricted networks should be set now.
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index 488911b..44c721a 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp | |||
@@ -155,31 +155,34 @@ void WLANImp::changeAndSaveSettingFile(){ | |||
155 | if(!line.contains("esac")) | 155 | if(!line.contains("esac")) |
156 | stream << line << "\n"; | 156 | stream << line << "\n"; |
157 | 157 | ||
158 | stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; | 158 | stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; |
159 | stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n'; | 159 | stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n'; |
160 | 160 | ||
161 | stream << "\tKEY0=" << keyLineEdit0->text() << "\n"; | 161 | stream << "\tKEY0=" << keyLineEdit0->text() << "\n"; |
162 | stream << "\tKEY1=" << keyLineEdit1->text() << "\n"; | 162 | stream << "\tKEY1=" << keyLineEdit1->text() << "\n"; |
163 | stream << "\tKEY2=" << keyLineEdit2->text() << "\n"; | 163 | stream << "\tKEY2=" << keyLineEdit2->text() << "\n"; |
164 | stream << "\tKEY3=" << keyLineEdit3->text() << "\n"; | 164 | stream << "\tKEY3=" << keyLineEdit3->text() << "\n"; |
165 | 165 | ||
166 | if(wepEnabled->isChecked()){ | 166 | if(wepEnabled->isChecked()){ |
167 | stream << "\tKEY="; | 167 | stream << "\tKEY=\""; |
168 | if(keyRadio0->isChecked()) stream << keyLineEdit0->text(); | 168 | if(keyRadio0->isChecked()) stream << keyLineEdit0->text(); |
169 | if(keyRadio1->isChecked()) stream << keyLineEdit1->text(); | 169 | if(keyRadio1->isChecked()) stream << keyLineEdit1->text(); |
170 | if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); | 170 | if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); |
171 | if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); | 171 | if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); |
172 | if(authOpen->isChecked()) stream << " open"; | 172 | if(authOpen->isChecked()) |
173 | stream << "\n"; | 173 | stream << " open"; |
174 | else | ||
175 | stream << " restricted"; | ||
176 | stream << "\n\""; | ||
174 | } | 177 | } |
175 | stream << "\tCHANNEL=" << networkChannel->value() << "\n"; | 178 | stream << "\tCHANNEL=" << networkChannel->value() << "\n"; |
176 | stream << "\tRATE=auto\n"; | 179 | stream << "\tRATE=auto\n"; |
177 | if(line.contains("esac")) | 180 | if(line.contains("esac")) |
178 | stream << line << "\n"; | 181 | stream << line << "\n"; |
179 | } | 182 | } |
180 | if(line.contains(";;")) | 183 | if(line.contains(";;")) |
181 | output = true; | 184 | output = true; |
182 | if(output) | 185 | if(output) |
183 | stream << (*it) << '\n'; | 186 | stream << (*it) << '\n'; |
184 | } | 187 | } |
185 | file.close(); | 188 | file.close(); |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 488911b..44c721a 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -155,31 +155,34 @@ void WLANImp::changeAndSaveSettingFile(){ | |||
155 | if(!line.contains("esac")) | 155 | if(!line.contains("esac")) |
156 | stream << line << "\n"; | 156 | stream << line << "\n"; |
157 | 157 | ||
158 | stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; | 158 | stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; |
159 | stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n'; | 159 | stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n'; |
160 | 160 | ||
161 | stream << "\tKEY0=" << keyLineEdit0->text() << "\n"; | 161 | stream << "\tKEY0=" << keyLineEdit0->text() << "\n"; |
162 | stream << "\tKEY1=" << keyLineEdit1->text() << "\n"; | 162 | stream << "\tKEY1=" << keyLineEdit1->text() << "\n"; |
163 | stream << "\tKEY2=" << keyLineEdit2->text() << "\n"; | 163 | stream << "\tKEY2=" << keyLineEdit2->text() << "\n"; |
164 | stream << "\tKEY3=" << keyLineEdit3->text() << "\n"; | 164 | stream << "\tKEY3=" << keyLineEdit3->text() << "\n"; |
165 | 165 | ||
166 | if(wepEnabled->isChecked()){ | 166 | if(wepEnabled->isChecked()){ |
167 | stream << "\tKEY="; | 167 | stream << "\tKEY=\""; |
168 | if(keyRadio0->isChecked()) stream << keyLineEdit0->text(); | 168 | if(keyRadio0->isChecked()) stream << keyLineEdit0->text(); |
169 | if(keyRadio1->isChecked()) stream << keyLineEdit1->text(); | 169 | if(keyRadio1->isChecked()) stream << keyLineEdit1->text(); |
170 | if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); | 170 | if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); |
171 | if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); | 171 | if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); |
172 | if(authOpen->isChecked()) stream << " open"; | 172 | if(authOpen->isChecked()) |
173 | stream << "\n"; | 173 | stream << " open"; |
174 | else | ||
175 | stream << " restricted"; | ||
176 | stream << "\n\""; | ||
174 | } | 177 | } |
175 | stream << "\tCHANNEL=" << networkChannel->value() << "\n"; | 178 | stream << "\tCHANNEL=" << networkChannel->value() << "\n"; |
176 | stream << "\tRATE=auto\n"; | 179 | stream << "\tRATE=auto\n"; |
177 | if(line.contains("esac")) | 180 | if(line.contains("esac")) |
178 | stream << line << "\n"; | 181 | stream << line << "\n"; |
179 | } | 182 | } |
180 | if(line.contains(";;")) | 183 | if(line.contains(";;")) |
181 | output = true; | 184 | output = true; |
182 | if(output) | 185 | if(output) |
183 | stream << (*it) << '\n'; | 186 | stream << (*it) << '\n'; |
184 | } | 187 | } |
185 | file.close(); | 188 | file.close(); |