| author | benmeyer <benmeyer> | 2002-10-30 20:43:56 (UTC) |
|---|---|---|
| committer | benmeyer <benmeyer> | 2002-10-30 20:43:56 (UTC) |
| commit | 26b5befecbb8a763a7fde36b0b3299bd9dd28f73 (patch) (side-by-side diff) | |
| tree | 3170521118daaed4145f12705d52748b4612ae67 | |
| parent | 3c1824f39867bc2ada45fe32785267caa5dfb04b (diff) | |
| download | opie-26b5befecbb8a763a7fde36b0b3299bd9dd28f73.zip opie-26b5befecbb8a763a7fde36b0b3299bd9dd28f73.tar.gz opie-26b5befecbb8a763a7fde36b0b3299bd9dd28f73.tar.bz2 | |
Removed requirment for DNS in setup
| -rw-r--r-- | noncore/net/networksetup/interfaces/interfacesetupimp.cpp | 6 | ||||
| -rw-r--r-- | noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp index d42b45d..6587d6f 100644 --- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp +++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp @@ -58,8 +58,8 @@ bool InterfaceSetupImp::saveSettings(){ return true; } - if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty() || firstDNSLineEdit->text().isEmpty())){ - QMessageBox::information(this, "Empy Fields.", "Please fill in address, subnet,\n gateway and the first dns entries.", "Ok"); + if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){ + QMessageBox::information(this, "Empy Fields.", "Please fill in address, subnet,\n and gateway entries.", "Ok"); return false; } interfaces->removeAllInterfaceOptions(); @@ -75,10 +75,12 @@ bool InterfaceSetupImp::saveSettings(){ interfaces->setInterfaceOption("address", ipAddressEdit->text()); interfaces->setInterfaceOption("netmask", subnetMaskEdit->text()); interfaces->setInterfaceOption("gateway", gatewayEdit->text()); + if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){ QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text(); interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns); interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns); } + } // IP Information interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index d42b45d..6587d6f 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp @@ -58,8 +58,8 @@ bool InterfaceSetupImp::saveSettings(){ return true; } - if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty() || firstDNSLineEdit->text().isEmpty())){ - QMessageBox::information(this, "Empy Fields.", "Please fill in address, subnet,\n gateway and the first dns entries.", "Ok"); + if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){ + QMessageBox::information(this, "Empy Fields.", "Please fill in address, subnet,\n and gateway entries.", "Ok"); return false; } interfaces->removeAllInterfaceOptions(); @@ -75,10 +75,12 @@ bool InterfaceSetupImp::saveSettings(){ interfaces->setInterfaceOption("address", ipAddressEdit->text()); interfaces->setInterfaceOption("netmask", subnetMaskEdit->text()); interfaces->setInterfaceOption("gateway", gatewayEdit->text()); + if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){ QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text(); interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns); interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns); } + } // IP Information interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); |