Index: orca_gui_prefs.py
===================================================================
RCS file: /cvs/gnome/orca/src/orca/orca_gui_prefs.py,v
retrieving revision 1.49
diff -u -r1.49 orca_gui_prefs.py
--- orca_gui_prefs.py	28 Jul 2006 17:33:17 -0000	1.49
+++ orca_gui_prefs.py	7 Aug 2006 16:34:47 -0000
@@ -396,8 +396,8 @@
         - combobox: the GtkComboBox to search.
         - str: the string to search for.
 
-        Returns the index of the first entry in combobox with str, on
-        None if not found.
+        Returns the index of the first entry in combobox with str, or
+        0 if not found.
         """
 
         model = combobox.get_model()
@@ -408,7 +408,7 @@
                 return i
             iter = model.iter_next(iter)
 
-        return None
+        return 0
 
     def _setupServers(self):
         """Get the list of speech servers for the current speech factory.
Index: orca_state.py
===================================================================
RCS file: /cvs/gnome/orca/src/orca/orca_state.py,v
retrieving revision 1.1
diff -u -r1.1 orca_state.py
--- orca_state.py	28 Jul 2006 17:33:17 -0000	1.1
+++ orca_state.py	7 Aug 2006 16:34:47 -0000
@@ -46,7 +46,7 @@
 # The last timestamp from a device event. Used to set focus for the Orca
 # configuration GUI.
 #
-lastInputEventTimestamp = None
+lastInputEventTimestamp = 0
 
 # Records the last time a key was echoed.
 #
