summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-28 04:00:35 (UTC)
committer kergoth <kergoth>2003-03-28 04:00:35 (UTC)
commit5ceaf5abfb26bb57687eead3201c08034239dd30 (patch) (unidiff)
tree1bec6c5aece4211abd19248c1bb24731641dc671
parent1f7da3774c074c57832c7eaa88dd67fba370db71 (diff)
downloadopie-5ceaf5abfb26bb57687eead3201c08034239dd30.zip
opie-5ceaf5abfb26bb57687eead3201c08034239dd30.tar.gz
opie-5ceaf5abfb26bb57687eead3201c08034239dd30.tar.bz2
Correct the use of OProcess.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index db03266..3797e22 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -205,44 +205,38 @@ void WLANImp::changeAndSaveSettingFile(){
205/** 205/**
206 * Check to see if the current config is valid 206 * Check to see if the current config is valid
207 * Save wireless.opts, save interfaces 207 * Save wireless.opts, save interfaces
208 */ 208 */
209void WLANImp::accept(){ 209void WLANImp::accept(){
210 if(wepEnabled->isChecked()){ 210 if(wepEnabled->isChecked()){
211 if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){ 211 if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
212 QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok); 212 QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
213 return; 213 return;
214 } 214 }
215 } 215 }
216 216
217 if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){ 217 if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
218 QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok); 218 QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
219 return; 219 return;
220 } 220 }
221 221
222 // Ok settings are good here, save 222 // Ok settings are good here, save
223 changeAndSaveSettingFile(); 223 changeAndSaveSettingFile();
224 224
225 // Try to save the interfaces settings. 225 // Try to save the interfaces settings.
226 if(!interfaceSetup->saveChanges()) 226 if(!interfaceSetup->saveChanges())
227 return; 227 return;
228 228
229 OProcess insert; 229 OProcess insert(QString("sh"));
230// OProcess eject; 230 insert << "-c";
231 231 insert << "cardctl eject && cardctl insert";
232 insert << "sh -c \"cardctl insert && cardctl eject\"";
233// eject << "cardctl eject";
234
235// if (!eject.start(OProcess::Block, OProcess::NoCommunication) ) {
236// qWarning("could not start cardctl eject");
237// }
238 232
239 if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) { 233 if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) {
240 qWarning("could not start cardctl insert"); 234 qWarning("could not start cardctl");
241 } 235 }
242 236
243 // Close out the dialog 237 // Close out the dialog
244 QDialog::accept(); 238 QDialog::accept();
245} 239}
246 240
247// wlanimp.cpp 241// wlanimp.cpp
248 242