orca r3753 - in trunk: . src/orca

[richb svn gnome org]

Author: richb
Date: Tue Mar 25 18:06:50 2008
New Revision: 3753
URL: http://svn.gnome.org/viewvc/orca?rev=3753&view=rev

Log:
        * src/orca/orca_gui_prefs.py:
          Fix for bug #523712 - Orca application specific preferences window 
          doesn't always get focus when user types Insert-Control-Space.


Modified:
   trunk/ChangeLog
   trunk/src/orca/orca_gui_prefs.py

Modified: trunk/src/orca/orca_gui_prefs.py
==============================================================================
--- trunk/src/orca/orca_gui_prefs.py	(original)
+++ trunk/src/orca/orca_gui_prefs.py	Tue Mar 25 18:06:50 2008
@@ -1859,24 +1859,22 @@
 
         # We want the Orca preferences window to have focus when it is
         # shown. First try using the present() call. If this isn't present
-        # in the version of pygtk that the user is using, fall back to
-        # trying to set the current time on the Preferences window using
-        # set_user_time. If that isn't found, then catch the exception and
-        # fail gracefully.
+        # in the version of pygtk that the user is using, just catch the
+        # exception. Then try to set the current time on the Preferences 
+        # window using set_user_time. If that isn't found, then catch the 
+        # exception and fail gracefully.
         #
         orcaSetupWindow.realize()
         try:
             if settings.showMainWindow:
                 orcaSetupWindow.present()
-            else:
-                orcaSetupWindow.window.set_user_time(\
-                    orca_state.lastInputEventTimestamp)
         except:
-            try:
-                orcaSetupWindow.window.set_user_time(\
-                    orca_state.lastInputEventTimestamp)
-            except AttributeError:
-                debug.printException(debug.LEVEL_FINEST)
+            pass
+        try:
+            orcaSetupWindow.window.set_user_time(\
+                orca_state.lastInputEventTimestamp)
+        except AttributeError:
+            debug.printException(debug.LEVEL_FINEST)
 
         # We always want to re-order the text attributes page so that enabled
         # items are consistently at the top.