--- system-config-mouse-1.2.9/src/mouse_gui.py~	2005-04-01 15:04:36.228563992 +1000
+++ system-config-mouse-1.2.9/src/mouse_gui.py	2005-04-01 15:04:46.066068464 +1000
@@ -112,7 +112,7 @@ class MouseWindow(FirstbootGuiWindow):
         self.mouseView = gtk.TreeView(self.mouseStore)
         self.col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0)
         self.mouseView.append_column(self.col)
-        self.mouseView.set_property("headers-visible", gtk.FALSE)
+        self.mouseView.set_property("headers-visible", False)
         selection = self.mouseView.get_selection()
         selection.connect("changed", self.selectMouse)
 
@@ -131,24 +131,24 @@ class MouseWindow(FirstbootGuiWindow):
 
         self.serialButton = gtk.Button(_("_Serial devices..."))
         self.serialButton.connect("clicked", self.on_serialButton_clicked)
-        self.serialButton.set_sensitive(gtk.FALSE)
+        self.serialButton.set_sensitive(False)
 
         hbox = gtk.HBox()
-        hbox.pack_start(self.Xemu3CheckButton, gtk.TRUE)
-        hbox.pack_start(self.serialButton, gtk.FALSE)
+        hbox.pack_start(self.Xemu3CheckButton, True)
+        hbox.pack_start(self.serialButton, False)
 
         self.myVbox = gtk.VBox()
         self.myVbox.set_spacing(5)
-        self.myVbox.pack_start(self.mouseViewSW, gtk.TRUE)
-        self.myVbox.pack_start(hbox, gtk.FALSE, 3)
+        self.myVbox.pack_start(self.mouseViewSW, True)
+        self.myVbox.pack_start(hbox, False, 3)
 
         self.serialDlg = gtk.Dialog(_("Serial Devices"))
         self.serialDlg.set_border_width(10)
         label = gtk.Label(_("Select the correct serial device for the mouse."))
         label.set_alignment(0.0, 0.5)
         self.serialDlg.vbox.set_spacing(5)
-        self.serialDlg.vbox.pack_start(label, gtk.FALSE)
-        self.serialDlg.vbox.pack_start(self.deviceViewSW, gtk.TRUE)
+        self.serialDlg.vbox.pack_start(label, False)
+        self.serialDlg.vbox.pack_start(self.deviceViewSW, True)
         self.serialDlg.add_button(gtk.STOCK_OK, 0)
 
         self.setupMice()
@@ -220,14 +220,14 @@ class MouseWindow(FirstbootGuiWindow):
         emu3 = self.mouseStore.get_value(iter, 3)
 
         if type == "ttyS":
-            self.serialButton.set_sensitive(gtk.TRUE)
+            self.serialButton.set_sensitive(True)
         else:
-            self.serialButton.set_sensitive(gtk.FALSE)
+            self.serialButton.set_sensitive(False)
 
         if emu3 == 0:
-            self.Xemu3CheckButton.set_active(gtk.FALSE)
+            self.Xemu3CheckButton.set_active(False)
         else:
-            self.Xemu3CheckButton.set_active(gtk.TRUE)
+            self.Xemu3CheckButton.set_active(True)
             
     def setupDeviceList(self):
 	deviceList = ((_("/dev/ttyS0 (COM1 under DOS)"), "ttyS0" ),
@@ -270,16 +270,16 @@ class MouseWindow(FirstbootGuiWindow):
             if self.mouseStore.get_value(iter, 1) == currentMouse:
 		if parent:
 		    path = self.mouseStore.get_path(parent)
-		    self.mouseView.expand_row(path, gtk.TRUE)
+		    self.mouseView.expand_row(path, True)
                 foundMatch = 1
                 selection = self.mouseView.get_selection()
                 selection.unselect_all()
                 selection.select_iter(iter)
                 path = self.mouseStore.get_path(iter)
                 col = self.mouseView.get_column(0)
-                self.mouseView.set_cursor(path, col, gtk.FALSE)
+                self.mouseView.set_cursor(path, col, False)
                 if recenter:
-                    self.mouseView.scroll_to_cell(path, col, gtk.TRUE,
+                    self.mouseView.scroll_to_cell(path, col, True,
                                                   0.5, 0.5)
 
             # get the next row.
@@ -298,20 +298,20 @@ class MouseWindow(FirstbootGuiWindow):
             while generic_iter:
                 if self.mouseStore.get_value(generic_iter, 1) == "Generic - 2 Button Mouse (PS/2)":
 		    path = self.mouseStore.get_path(parent)
-		    self.mouseView.expand_row(path, gtk.TRUE)
+		    self.mouseView.expand_row(path, True)
                     selection = self.mouseView.get_selection()
                     selection.unselect_all()
                     selection.select_iter(generic_iter)
                     path = self.mouseStore.get_path(generic_iter)
                     col = self.mouseView.get_column(0)
-                    self.mouseView.set_cursor(path, col, gtk.FALSE)
+                    self.mouseView.set_cursor(path, col, False)
                     
                 generic_iter = self.mouseStore.iter_next(generic_iter)
             
         if emulate3 == "yes":
-            self.Xemu3CheckButton.set_active(gtk.TRUE)
+            self.Xemu3CheckButton.set_active(True)
         else:
-            self.Xemu3CheckButton.set_active(gtk.FALSE)
+            self.Xemu3CheckButton.set_active(False)
         self.ignoreEvents = 0
     
     def launch(self, doDebug=None):
@@ -323,7 +323,7 @@ class MouseWindow(FirstbootGuiWindow):
         label = gtk.Label(_(self.shortMessage))
         label.set_alignment(0.0, 0.5)
         label.set_size_request(500, -1)
-        self.myVbox.pack_start(label, gtk.FALSE)
+        self.myVbox.pack_start(label, False)
         self.myVbox.reorder_child(label, 0)
         self.myVbox.set_spacing(10)
         self.myVbox.set_border_width(10)
@@ -340,7 +340,7 @@ class MouseWindow(FirstbootGuiWindow):
                                     (_("Please select a mouse.")))
             dlg.set_position(gtk.WIN_POS_CENTER)
             dlg.set_icon(iconPixbuf)
-            dlg.set_modal(gtk.TRUE)
+            dlg.set_modal(True)
             dlg.run()
             dlg.destroy()
             return
@@ -353,7 +353,7 @@ class MouseWindow(FirstbootGuiWindow):
         else:
             Xemu3 = "no"
 
-        if self.Xemu3CheckButton.get_active() == gtk.TRUE:
+        if self.Xemu3CheckButton.get_active() == True:
             Xemu3 = "yes"
 
 
@@ -394,7 +394,7 @@ class MouseWindow(FirstbootGuiWindow):
                                     (_("Please select a mouse.")))
             dlg.set_position(gtk.WIN_POS_CENTER)
             dlg.set_icon(iconPixbuf)
-            dlg.set_modal(gtk.TRUE)
+            dlg.set_modal(True)
             dlg.run()
             dlg.destroy()
             return