summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/wlan/wlanimp.cpp
authorandyq <andyq>2002-11-10 15:34:59 (UTC)
committer andyq <andyq>2002-11-10 15:34:59 (UTC)
commit6d3fd69b7f14971d837e4fd13084bb978592a752 (patch) (unidiff)
tree9c11d7be738bc147215af59654c9ab1f51ddcf10 /noncore/settings/networksettings/wlan/wlanimp.cpp
parent804e08f4642353af836bab921d8f732709051de0 (diff)
downloadopie-6d3fd69b7f14971d837e4fd13084bb978592a752.zip
opie-6d3fd69b7f14971d837e4fd13084bb978592a752.tar.gz
opie-6d3fd69b7f14971d837e4fd13084bb978592a752.tar.bz2
Added braces round key checking if statement to fix bug that WEP settings
were never saved if WEP was enabled
Diffstat (limited to 'noncore/settings/networksettings/wlan/wlanimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index d4b4af9..e64a633 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -179,52 +179,55 @@ void WLANImp::changeAndSaveSettingFile(){
179 if(keyRadio0->isChecked()) stream << "1]"; 179 if(keyRadio0->isChecked()) stream << "1]";
180 if(keyRadio1->isChecked()) stream << "2]"; 180 if(keyRadio1->isChecked()) stream << "2]";
181 if(keyRadio2->isChecked()) stream << "3]"; 181 if(keyRadio2->isChecked()) stream << "3]";
182 if(keyRadio3->isChecked()) stream << "4]"; 182 if(keyRadio3->isChecked()) stream << "4]";
183 if(authOpen->isChecked()) stream << " open"; 183 if(authOpen->isChecked()) stream << " open";
184 stream << "\n"; 184 stream << "\n";
185 stream << "\tCHANNEL=" << networkChannel->value() << "\n"; 185 stream << "\tCHANNEL=" << networkChannel->value() << "\n";
186 stream << "\tRATE=auto\n"; 186 stream << "\tRATE=auto\n";
187 if(line.contains("esac")) 187 if(line.contains("esac"))
188 stream << line << "\n"; 188 stream << line << "\n";
189 } 189 }
190 if(line.contains(";;")) 190 if(line.contains(";;"))
191 output = true; 191 output = true;
192 if(output) 192 if(output)
193 stream << (*it) << '\n'; 193 stream << (*it) << '\n';
194 } 194 }
195 file.close(); 195 file.close();
196} 196}
197 197
198/** 198/**
199 * Check to see if the current config is valid 199 * Check to see if the current config is valid
200 * Save wireless.opts, save interfaces 200 * Save wireless.opts, save interfaces
201 */ 201 */
202void WLANImp::accept(){ 202void WLANImp::accept(){
203 printf( "Accept pressed\n" );
203 if(wepEnabled->isChecked()){ 204 if(wepEnabled->isChecked()){
204 if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) 205 if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
205 QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); 206 {
206 return; 207 QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok);
208 return;
209 }
207 } 210 }
208 211
209 // Ok settings are good here, save 212 // Ok settings are good here, save
210 changeAndSaveSettingFile(); 213 changeAndSaveSettingFile();
211 214
212 // Try to save the interfaces settings. 215 // Try to save the interfaces settings.
213 if(!interfaceSetup->saveChanges()) 216 if(!interfaceSetup->saveChanges())
214 return; 217 return;
215 218
216 // Restart the device now that the settings have changed 219 // Restart the device now that the settings have changed
217 QString initpath; 220 QString initpath;
218 if( QDir("/etc/rc.d/init.d").exists() ) 221 if( QDir("/etc/rc.d/init.d").exists() )
219 initpath = "/etc/rc.d/init.d"; 222 initpath = "/etc/rc.d/init.d";
220 else if( QDir("/etc/init.d").exists() ) 223 else if( QDir("/etc/init.d").exists() )
221 initpath = "/etc/init.d"; 224 initpath = "/etc/init.d";
222 if( initpath ) 225 if( initpath )
223 system(QString("%1/pcmcia stop").arg(initpath)); 226 system(QString("%1/pcmcia stop").arg(initpath));
224 if( initpath ) 227 if( initpath )
225 system(QString("%1/pcmcia start").arg(initpath)); 228 system(QString("%1/pcmcia start").arg(initpath));
226 229
227 // Close out the dialog 230 // Close out the dialog
228 QDialog::accept(); 231 QDialog::accept();
229} 232}
230 233