Diffstat (limited to 'noncore/net/networksetup/wlan/wlanimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index ef7329e..120d4e5 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp | |||
@@ -203,42 +203,41 @@ void WLANImp::changeAndSaveSettingFile(){ | |||
203 | * Check to see if the current config is valid | 203 | * Check to see if the current config is valid |
204 | * Save wireless.opts, save interfaces | 204 | * Save wireless.opts, save interfaces |
205 | */ | 205 | */ |
206 | void WLANImp::accept(){ | 206 | void WLANImp::accept(){ |
207 | if(wepEnabled->isChecked()){ | 207 | if(wepEnabled->isChecked()){ |
208 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) | 208 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) |
209 | { | 209 | { |
210 | QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok); | 210 | QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok); |
211 | return; | 211 | return; |
212 | } | 212 | } |
213 | } | 213 | } |
214 | 214 | ||
215 | if(essSpecificLineEdit->text().isEmpty()){ | 215 | if(essSpecificLineEdit->text().isEmpty()){ |
216 | QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok); | 216 | QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok); |
217 | return; | 217 | return; |
218 | } | 218 | } |
219 | 219 | ||
220 | // Ok settings are good here, save | 220 | // Ok settings are good here, save |
221 | changeAndSaveSettingFile(); | 221 | changeAndSaveSettingFile(); |
222 | 222 | ||
223 | // Try to save the interfaces settings. | 223 | // Try to save the interfaces settings. |
224 | if(!interfaceSetup->saveChanges()) | 224 | if(!interfaceSetup->saveChanges()) |
225 | return; | 225 | return; |
226 | 226 | ||
227 | return; | ||
228 | // Restart the device now that the settings have changed | 227 | // Restart the device now that the settings have changed |
229 | QString initpath; | 228 | QString initpath; |
230 | if( QDir("/etc/rc.d/init.d").exists() ) | 229 | if( QDir("/etc/rc.d/init.d").exists() ) |
231 | initpath = "/etc/rc.d/init.d"; | 230 | initpath = "/etc/rc.d/init.d"; |
232 | else if( QDir("/etc/init.d").exists() ) | 231 | else if( QDir("/etc/init.d").exists() ) |
233 | initpath = "/etc/init.d"; | 232 | initpath = "/etc/init.d"; |
234 | if( initpath ) | 233 | if( initpath ) |
235 | system(QString("%1/pcmcia stop").arg(initpath)); | 234 | system(QString("%1/pcmcia stop").arg(initpath)); |
236 | if( initpath ) | 235 | if( initpath ) |
237 | system(QString("%1/pcmcia start").arg(initpath)); | 236 | system(QString("%1/pcmcia start").arg(initpath)); |
238 | 237 | ||
239 | // Close out the dialog | 238 | // Close out the dialog |
240 | QDialog::accept(); | 239 | QDialog::accept(); |
241 | } | 240 | } |
242 | 241 | ||
243 | // wlanimp.cpp | 242 | // wlanimp.cpp |
244 | 243 | ||