[orca/gnome-3-12] Remove an obsolete Evolution hackaround



commit 4a059899ce2e31a8522454aa06c1e8e9db755770
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Mar 20 15:18:23 2014 -0400

    Remove an obsolete Evolution hackaround

 src/orca/scripts/apps/evolution/Makefile.am        |    1 -
 src/orca/scripts/apps/evolution/formatting.py      |   50 --------------------
 src/orca/scripts/apps/evolution/script.py          |    5 --
 .../scripts/apps/evolution/speech_generator.py     |   21 --------
 4 files changed, 0 insertions(+), 77 deletions(-)
---
diff --git a/src/orca/scripts/apps/evolution/Makefile.am b/src/orca/scripts/apps/evolution/Makefile.am
index ba238e9..164e415 100644
--- a/src/orca/scripts/apps/evolution/Makefile.am
+++ b/src/orca/scripts/apps/evolution/Makefile.am
@@ -1,6 +1,5 @@
 orca_python_PYTHON = \
     __init__.py \
-    formatting.py \
     script.py \
     speech_generator.py
 
diff --git a/src/orca/scripts/apps/evolution/script.py b/src/orca/scripts/apps/evolution/script.py
index c534738..4b102de 100644
--- a/src/orca/scripts/apps/evolution/script.py
+++ b/src/orca/scripts/apps/evolution/script.py
@@ -34,7 +34,6 @@ import orca.scripts.toolkits.WebKitGtk as WebKitGtk
 import orca.settings as settings
 import orca.settings_manager as settings_manager
 
-from .formatting import Formatting
 from .speech_generator import SpeechGenerator
 
 _settingsManager = settings_manager.getManager()
@@ -63,10 +62,6 @@ class Script(WebKitGtk.Script):
 
         return SpeechGenerator(self)
 
-    def getFormatting(self):
-        """Returns the formatting strings for this script."""
-        return Formatting(self)
-
     def isActivatableEvent(self, event):
         """Returns True if the given event is one that should cause this
         script to become the active script.  This is only a hint to
diff --git a/src/orca/scripts/apps/evolution/speech_generator.py 
b/src/orca/scripts/apps/evolution/speech_generator.py
index 24daf73..07b0005 100644
--- a/src/orca/scripts/apps/evolution/speech_generator.py
+++ b/src/orca/scripts/apps/evolution/speech_generator.py
@@ -44,27 +44,6 @@ class SpeechGenerator(WebKitGtk.SpeechGenerator):
     def __init__(self, script):
         WebKitGtk.SpeechGenerator.__init__(self, script)
 
-    def _generateRealTableCell(self, obj, **args):
-        # Check that we are in a table cell in the mail message header list.
-        # If we are and this table cell has an expanded state, then
-        # dont speak the number of items.
-        # See bug #432308 for more details.
-        #
-        rolesList = [pyatspi.ROLE_TABLE_CELL, \
-                     pyatspi.ROLE_TREE_TABLE, \
-                     pyatspi.ROLE_UNKNOWN]
-        if self._script.utilities.hasMatchingHierarchy(obj, rolesList):
-            state = obj.getState()
-            if state and state.contains(pyatspi.STATE_EXPANDABLE):
-                if state.contains(pyatspi.STATE_EXPANDED):
-                    oldRole = self._overrideRole(
-                        'ALTERNATIVE_REAL_ROLE_TABLE_CELL', args)
-                    result = self.generateSpeech(obj, **args)
-                    self._restoreRole(oldRole, args)
-                    return result
-        return speech_generator.SpeechGenerator._generateRealTableCell(
-            self, obj, **args)
-
     def _generateTableCellRow(self, obj, **args):
         """Orca has a feature to automatically read an entire row of a table
         as the user arrows up/down the roles.  This leads to complexity in


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]