orca r4351 - in branches/gnome-2-24: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Wed Nov 19 16:34:11 2008
New Revision: 4351
URL: http://svn.gnome.org/viewvc/orca?rev=4351&view=rev

Log:
Fix for bug #554002 - Orca App-Preferences dialog page tabs are "off" by one in speech and braille.


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/orca/app_gui_prefs.py
   branches/gnome-2-24/src/orca/default.py

Modified: branches/gnome-2-24/src/orca/app_gui_prefs.py
==============================================================================
--- branches/gnome-2-24/src/orca/app_gui_prefs.py	(original)
+++ branches/gnome-2-24/src/orca/app_gui_prefs.py	Wed Nov 19 16:34:11 2008
@@ -19,9 +19,9 @@
 
 """Displays a GUI for the user to set Orca application-specific preferences."""
 
-__id__        = "$Id:$"
-__version__   = "$Revision:$"
-__date__      = "$Date:$"
+__id__        = "$Id$"
+__version__   = "$Revision$"
+__date__      = "$Date$"
 __copyright__ = "Copyright (c) 2007-2008 Sun Microsystems Inc."
 __license__   = "LGPL"
 
@@ -86,7 +86,13 @@
         #
         self.appScript = thisAppScript
 
-        self.get_widget("notebook").remove_page(0)
+        # Don't remove the page because this tickles some strange bug
+        # in gail or gtk+ (see bug #554002).  Instead, we'll just hide it.
+        #
+        # self.get_widget("notebook").remove_page(0)
+        generalTab = self.get_widget("notebook").get_children()[0]
+        generalTab.hide()
+
         self.get_widget("speechSystemsLabel").set_sensitive(False)
         self.get_widget("speechSystems").set_sensitive(False)
         self.get_widget("speechServersLabel").set_sensitive(False)

Modified: branches/gnome-2-24/src/orca/default.py
==============================================================================
--- branches/gnome-2-24/src/orca/default.py	(original)
+++ branches/gnome-2-24/src/orca/default.py	Wed Nov 19 16:34:11 2008
@@ -5891,15 +5891,6 @@
         if role == pyatspi.ROLE_COMBO_BOX:
             return self.__getDisplayedTextInComboBox(obj)
 
-        if role == pyatspi.ROLE_PAGE_TAB and obj.name:
-            # It seems that hiding a page tab can result in the accessible
-            # text being the text associated with the previous page tab.
-            # The accessible name, however, continues to be correct. For
-            # now, let's use the name -- until the Gtk+ bug is pinned down
-            # and fixed. See bug #554002.
-            #
-            return obj.name
-
         # The accessible text of an object is used to represent what is
         # drawn on the screen.
         #