Made the hostname and domain entries one entry again.

1 files changed, 3 insertions, 30 deletions

diff --git a/textw/network_text.py b/textw/network_text.py
index 9e0ddf599..e8d15f892 100644
--- a/textw/network_text.py
+++ b/textw/network_text.py
@@ -149,50 +149,23 @@ class HostnameWindow:
             return
         
         entry = Entry (24)
-        domainEntry = Entry (24)
 
         if todo.network.hostname != "localhost.localdomain":
-
-            #--Loader passes in hostname and domain as one line.  To make it more clear to the user,
-            #--we split the hostname off the domain and put them in different GtkEntry boxes
-            hs = todo.network.hostname
-            tmp = string.split(hs, ".")
-
-            entry.set (tmp[0])
-            count = 0
-            domain = ""
-            for token in tmp:
-                if count == 0:
-                    pass
-                elif count == 1:
-                    domain = domain + token
-                else:
-                    domain = domain + "." + token
-                count = count + 1
-
-            domainEntry.set (domain)
-
-            
-#            entry.set (todo.network.hostname)
+            entry.set (todo.network.hostname)
 
 
         rc, values = EntryWindow(screen, _("Hostname Configuration"),
              _("The hostname is the name of your computer.  If your "
                "computer is attached to a network, this may be "
                "assigned by your network administrator."),
-             [(_("Hostname"), entry), (_("Domain"), domainEntry)], buttons = [ _("OK"), _("Back")],
+             [(_("Hostname"), entry)], buttons = [ _("OK"), _("Back")],
 	     help = "hostname")
 
         if rc == string.lower (_("Back")):
             return INSTALL_BACK
 
-#        todo.network.hostname = entry.value ()
-
-        
-#        if (self.hostname.get_text () != ""):
+        todo.network.hostname = entry.value ()
 
-        fullname = entry.value() + "." + domainEntry.value()
-        todo.network.hostname = fullname
         print todo.network.hostname