summaryrefslogtreecommitdiff
authorandyq <andyq>2002-11-10 17:25:25 (UTC)
committer andyq <andyq>2002-11-10 17:25:25 (UTC)
commit270d8caf81bdf6486df38b78cb6f5299965ad9ce (patch) (side-by-side diff)
tree57bca357765a09c9479e360fe24bdf1e03143890
parent49574d593f9b9578cf3b8f4de8192188b807d144 (diff)
downloadopie-270d8caf81bdf6486df38b78cb6f5299965ad9ce.zip
opie-270d8caf81bdf6486df38b78cb6f5299965ad9ce.tar.gz
opie-270d8caf81bdf6486df38b78cb6f5299965ad9ce.tar.bz2
removed left in debug
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp1
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index e64a633..87a9716 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -155,81 +155,80 @@ void WLANImp::changeAndSaveSettingFile(){
for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
if(line.contains("case"))
foundCase = true;
// See if we found our scheme to write or the sceme couldn't be found
if((foundCase && line.contains("esac") && !found) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
// write out scheme
found = true;
output = false;
if(!line.contains("esac"))
stream << line << "\n";
stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n';
stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "AdHoc") << '\n';
if(!wepEnabled->isChecked())
stream << "#";
stream << "\tKEY=";
stream << keyLineEdit0->text() << " [1]";
stream << keyLineEdit1->text() << " [2]";
stream << keyLineEdit2->text() << " [3]";
stream << keyLineEdit3->text() << " [4]";
stream << " key [";
if(keyRadio0->isChecked()) stream << "1]";
if(keyRadio1->isChecked()) stream << "2]";
if(keyRadio2->isChecked()) stream << "3]";
if(keyRadio3->isChecked()) stream << "4]";
if(authOpen->isChecked()) stream << " open";
stream << "\n";
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
stream << "\tRATE=auto\n";
if(line.contains("esac"))
stream << line << "\n";
}
if(line.contains(";;"))
output = true;
if(output)
stream << (*it) << '\n';
}
file.close();
}
/**
* Check to see if the current config is valid
* Save wireless.opts, save interfaces
*/
void WLANImp::accept(){
- printf( "Accept pressed\n" );
if(wepEnabled->isChecked()){
if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
{
QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok);
return;
}
}
// Ok settings are good here, save
changeAndSaveSettingFile();
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
// Restart the device now that the settings have changed
QString initpath;
if( QDir("/etc/rc.d/init.d").exists() )
initpath = "/etc/rc.d/init.d";
else if( QDir("/etc/init.d").exists() )
initpath = "/etc/init.d";
if( initpath )
system(QString("%1/pcmcia stop").arg(initpath));
if( initpath )
system(QString("%1/pcmcia start").arg(initpath));
// Close out the dialog
QDialog::accept();
}
// wlanimp.cpp
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index e64a633..87a9716 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -155,81 +155,80 @@ void WLANImp::changeAndSaveSettingFile(){
for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
if(line.contains("case"))
foundCase = true;
// See if we found our scheme to write or the sceme couldn't be found
if((foundCase && line.contains("esac") && !found) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
// write out scheme
found = true;
output = false;
if(!line.contains("esac"))
stream << line << "\n";
stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n';
stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "AdHoc") << '\n';
if(!wepEnabled->isChecked())
stream << "#";
stream << "\tKEY=";
stream << keyLineEdit0->text() << " [1]";
stream << keyLineEdit1->text() << " [2]";
stream << keyLineEdit2->text() << " [3]";
stream << keyLineEdit3->text() << " [4]";
stream << " key [";
if(keyRadio0->isChecked()) stream << "1]";
if(keyRadio1->isChecked()) stream << "2]";
if(keyRadio2->isChecked()) stream << "3]";
if(keyRadio3->isChecked()) stream << "4]";
if(authOpen->isChecked()) stream << " open";
stream << "\n";
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
stream << "\tRATE=auto\n";
if(line.contains("esac"))
stream << line << "\n";
}
if(line.contains(";;"))
output = true;
if(output)
stream << (*it) << '\n';
}
file.close();
}
/**
* Check to see if the current config is valid
* Save wireless.opts, save interfaces
*/
void WLANImp::accept(){
- printf( "Accept pressed\n" );
if(wepEnabled->isChecked()){
if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
{
QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok);
return;
}
}
// Ok settings are good here, save
changeAndSaveSettingFile();
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
// Restart the device now that the settings have changed
QString initpath;
if( QDir("/etc/rc.d/init.d").exists() )
initpath = "/etc/rc.d/init.d";
else if( QDir("/etc/init.d").exists() )
initpath = "/etc/init.d";
if( initpath )
system(QString("%1/pcmcia stop").arg(initpath));
if( initpath )
system(QString("%1/pcmcia start").arg(initpath));
// Close out the dialog
QDialog::accept();
}
// wlanimp.cpp