--- system-config-rootpassword-1.1.6/src/passwordDialog.py~	2005-04-01 14:56:44.472281848 +1000
+++ system-config-rootpassword-1.1.6/src/passwordDialog.py	2005-04-01 14:56:48.546662448 +1000
@@ -63,14 +63,14 @@ class childWindow:
         self.mainWindow.set_position(gtk.WIN_POS_CENTER)
         self.mainWindow.set_icon(iconPixbuf)
         self.mainWindow.set_border_width(10)
-        self.mainWindow.set_resizable(gtk.FALSE)
-        self.toplevel = gtk.VBox(gtk.FALSE)
-        self.mainVBox = gtk.VBox(gtk.FALSE)
+        self.mainWindow.set_resizable(False)
+        self.toplevel = gtk.VBox(False)
+        self.mainVBox = gtk.VBox(False)
         self.iconBox = gtk.HBox()
         self.passwordEntry = gtk.Entry()
-        self.passwordEntry.set_visibility(gtk.FALSE)
+        self.passwordEntry.set_visibility(False)
         self.confirmEntry = gtk.Entry()
-        self.confirmEntry.set_visibility(gtk.FALSE)
+        self.confirmEntry.set_visibility(False)
 
         p = None
         self.icon = None
@@ -96,7 +96,7 @@ class childWindow:
             self.user = "root"
         else:
             self.msgLabel = gtk.Label(_("Please set the password for %s.") % self.user)
-        self.msgLabel.set_line_wrap(gtk.FALSE)
+        self.msgLabel.set_line_wrap(False)
         self.msgLabel.set_alignment(0.0, 0.5)
 
         self.table = gtk.Table(2, 2)
@@ -126,9 +126,9 @@ class childWindow:
             dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK,
                                     (_("Root password must be at least 6 characters in length.")))
             dlg.set_position(gtk.WIN_POS_CENTER)
-            dlg.set_modal(gtk.TRUE)
+            dlg.set_modal(True)
             dlg.set_icon(iconPixbuf)
-            dlg.set_has_separator(gtk.FALSE)
+            dlg.set_has_separator(False)
             dlg.run()
             dlg.destroy()
             self.passwordEntry.set_text("")
@@ -139,9 +139,9 @@ class childWindow:
             dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK,
                                     (_("Passwords do not match.  Please try again.")))
             dlg.set_position(gtk.WIN_POS_CENTER)
-            dlg.set_modal(gtk.TRUE)
+            dlg.set_modal(True)
             dlg.set_icon(iconPixbuf)
-            dlg.set_has_separator(gtk.FALSE)
+            dlg.set_has_separator(False)
             dlg.run()
             dlg.destroy()
             self.passwordEntry.set_text("")
@@ -168,13 +168,13 @@ class childWindow:
     def launch(self, doDebug = None):
         self.doDebug = doDebug
 
-        self.internalVBox = gtk.VBox(gtk.FALSE, 10)
+        self.internalVBox = gtk.VBox(False, 10)
         self.internalVBox.set_border_width(10)
 
         self.msgLabel.set_size_request(500, -1)
-        self.internalVBox.pack_start(self.msgLabel, gtk.FALSE)
-        self.internalVBox.pack_start(self.table, gtk.FALSE)
-        self.mainVBox.pack_start(self.internalVBox, gtk.TRUE)
+        self.internalVBox.pack_start(self.msgLabel, False)
+        self.internalVBox.pack_start(self.table, False)
+        self.mainVBox.pack_start(self.internalVBox, True)
         self.passwordEntry.grab_focus()
         return self.mainVBox, self.icon, self.moduleName
 
@@ -192,16 +192,16 @@ class childWindow:
         cancelButton.connect("clicked", self.destroy)
 
         if self.icon:
-            self.iconBox.pack_start(self.icon, gtk.FALSE)
-        self.iconBox.pack_start(self.msgLabel, gtk.FALSE)
+            self.iconBox.pack_start(self.icon, False)
+        self.iconBox.pack_start(self.msgLabel, False)
         self.mainWindow.add(self.toplevel)
         self.mainVBox.set_spacing(10)
-        self.toplevel.pack_start(self.iconBox, gtk.FALSE)
-        self.toplevel.pack_start(self.mainVBox, gtk.FALSE)
-        self.mainVBox.pack_start(self.table, gtk.FALSE)
+        self.toplevel.pack_start(self.iconBox, False)
+        self.toplevel.pack_start(self.mainVBox, False)
+        self.mainVBox.pack_start(self.table, False)
         bb.pack_start(cancelButton)
         bb.pack_start(okButton)
-        self.mainVBox.pack_start(bb, gtk.FALSE)
+        self.mainVBox.pack_start(bb, False)
 
         self.mainWindow.show_all()
         self.passwordEntry.grab_focus()