summaryrefslogtreecommitdiffstats
path: root/iw
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-06-27 18:37:06 +0000
committerChris Lumens <clumens@redhat.com>2006-06-27 18:37:06 +0000
commit1cec131ef8b63b9af8d686c78f10330c3e8deb37 (patch)
tree3c3751cab90e81945c5dbf49fd17c17b0de660a2 /iw
parentab9999976ab6015ed7d1ada526b1aa6868a34659 (diff)
downloadanaconda-1cec131ef8b63b9af8d686c78f10330c3e8deb37.tar.gz
anaconda-1cec131ef8b63b9af8d686c78f10330c3e8deb37.tar.xz
anaconda-1cec131ef8b63b9af8d686c78f10330c3e8deb37.zip
Make sure the contents of the UI end up in network.* variables (#196756)
Diffstat (limited to 'iw')
-rw-r--r--iw/network_gui.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/iw/network_gui.py b/iw/network_gui.py
index 8a2c807f9..838ea20c9 100644
--- a/iw/network_gui.py
+++ b/iw/network_gui.py
@@ -70,8 +70,8 @@ class NetworkWindow(InstallWindow):
tmpvals = {}
for t in range(len(global_options)):
try:
- network.sanityCheckIPString(self.globals[global_options[t]])
- tmpvals[t] = self.globals[global_options[t]]
+ network.sanityCheckIPString(self.globals[global_options[t]].get_text())
+ tmpvals[t] = self.globals[global_options[t]].get_text()
except network.IPMissing, msg:
if t < 2 and self.getNumberActiveDevices() > 0:
if self.handleMissingOptionalIP(global_options[t]):
@@ -595,24 +595,20 @@ class NetworkWindow(InstallWindow):
self.globals = {}
for t in range(len(global_options)):
- self.globals[global_options[t]] = options[t].get_text()
+ self.globals[global_options[t]] = options[t]
# bring over the value from the loader
self.hostnameEntry.set_text(self.network.hostname)
if not self.anyUsingDHCP():
if self.network.gateway:
- self.globals[_("Gateway")] = self.network.gateway
- options[0].set_text(self.network.gateway)
+ self.globals[_("Gateway")].set_text(self.network.gateway)
if self.network.primaryNS:
- self.globals[_("Primary DNS")] = self.network.primaryNS
- options[1].set_text(self.network.primaryNS)
+ self.globals[_("Primary DNS")].set_text(self.network.primaryNS)
if self.network.secondaryNS:
- self.globals[_("Secondary DNS")] = self.network.secondaryNS
- options[2].set_text(self.network.secondaryNS)
+ self.globals[_("Secondary DNS")].set_text(self.network.secondaryNS)
if self.network.ternaryNS:
- self.globals[_("Tertiary DNS")] = self.network.ternaryNS
- options[3].set_text(self.network.ternaryNS)
+ self.globals[_("Tertiary DNS")].set_text(self.network.ternaryNS)
self.ipTable.set_border_width(6)