orca r3772 - in trunk: . src/orca

[richb svn gnome org]

Author: richb
Date: Thu Mar 27 16:13:21 2008
New Revision: 3772
URL: http://svn.gnome.org/viewvc/orca?rev=3772&view=rev

Log:
Removing the fix for bug #520494 - Keyboard review punctuation in Firefox.
Use `speech.speakCharacter()' instead of `speech.speak()'.
It still needs work.


Modified:
   trunk/ChangeLog
   trunk/src/orca/Gecko.py
   trunk/src/orca/default.py

Modified: trunk/src/orca/Gecko.py
==============================================================================
--- trunk/src/orca/Gecko.py	(original)
+++ trunk/src/orca/Gecko.py	Thu Mar 27 16:13:21 2008
@@ -1,6 +1,6 @@
 # Orca
 #
-# Copyright 2005-2008 Sun Microsystems Inc.
+# Copyright 2005-2007 Sun Microsystems Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -8212,7 +8212,7 @@
         character = self.getCharacterAtOffset(obj, characterOffset)
         if obj:
             if character and character != self.EMBEDDED_OBJECT_CHARACTER:
-                speech.speakCharacter(character, self.getACSS(obj, character))
+                speech.speak(character, self.getACSS(obj, character), False)
             elif obj.getRole() != pyatspi.ROLE_ENTRY:
                 # We won't have a character if we move to the end of an
                 # entry (in which case we're not on a character and therefore

Modified: trunk/src/orca/default.py
==============================================================================
--- trunk/src/orca/default.py	(original)
+++ trunk/src/orca/default.py	Thu Mar 27 16:13:21 2008
@@ -2316,7 +2316,7 @@
                     #
                     speech.speak(_("blank"), voice, False)
         else:
-            speech.speakCharacter(character, voice)
+            speech.speak(chnames.getCharacterName(character), voice, False)
 
         self.speakTextSelectionState(obj, startOffset, endOffset)
 
@@ -3297,17 +3297,11 @@
         else:
             voice = self.voices[settings.DEFAULT_VOICE]
 
-        # Make sure single characters are sent to speakCharacter()
-        # rather than to speak().
+        # We won't interrupt what else might be being spoken
+        # right now because it is typically something else
+        # related to this event.
         #
-        if len(character) == 1:
-            speech.speakCharacter(character, voice)
-        else:
-            # We won't interrupt what else might be being spoken
-            # right now because it is typically something else
-            # related to this event.
-            #
-            speech.speak(character, voice, False)
+        speech.speak(character, voice, False)
 
     def onTextInserted(self, event):
         """Called whenever text is inserted into an object.
@@ -4454,10 +4448,10 @@
 
         for (charIndex, character) in enumerate(itemString.decode("UTF-8")):
             if character.isupper():
-                speech.speakCharacter(character.encode("UTF-8"),
+                speech.speak(character.encode("UTF-8"),
                              self.voices[settings.UPPERCASE_VOICE])
             else:
-                speech.speakCharacter(character.encode("UTF-8"))
+                speech.speak(character.encode("UTF-8"))
 
     def _reviewCurrentItem(self, inputEvent, targetCursorCell=0,
                            speechType=1):
@@ -6282,10 +6276,7 @@
             else:
                 voice =  settings.voices[settings.DEFAULT_VOICE]
             phoneticString = phonnames.getPhoneticName(character)
-            if len(phoneticString) == 1:
-                speech.speakCharacter(phoneticString, voice)
-            else:
-                speech.speak(phoneticString, voice)
+            speech.speak(phoneticString, voice)
 
     def printAncestry(self, child):
         """Prints a hierarchical view of a child's ancestry."""