[orca] Fix for bug #638048 and bug #628837

[Joanmarie Diggs <joanied src gnome org>]

commit e7ae9161bcadf87f95b2ff10824c7bc0bbbeb4a6
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Dec 26 12:35:13 2010 -0500

    Fix for bug #638048 and bug #628837
    
    * Orca is breaking up utterances in Gecko when it should not be
    * System Voice does not work correctly for Gecko

 src/orca/scripts/toolkits/Gecko/script.py          |   21 +++++++++----------
 .../scripts/toolkits/Gecko/speech_generator.py     |    5 ++-
 test/html/FirefoxProfile/prefs.js                  |    2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 006fcae..c37774c 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -1,7 +1,7 @@
 # Orca
 #
 # Copyright 2005-2009 Sun Microsystems Inc.
-# Copyright 2010 Joanmarie Diggs, Mesar Hameed.
+# Copyright 2010 Orca Team.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -38,7 +38,7 @@ http://developer.mozilla.org/en/docs/Accessibility/ATSPI_Support
 __id__        = "$Id$"
 __version__   = "$Revision$"
 __date__      = "$Date$"
-__copyright__ = "Copyright (c) 2010 Joanmarie Diggs, Mesar Hameed."
+__copyright__ = "Copyright (c) 2010 Orca Team."
 __license__   = "LGPL"
 
 import atk
@@ -5294,12 +5294,13 @@ class Script(default.Script):
             if not len(string) \
                or self.utilities.isEntry(obj) \
                or self.utilities.isPasswordText(obj):
-                utterance = self.speechGenerator.generateSpeech(obj)
+                utterances.append(self.speechGenerator.generateSpeech(obj))
             else:
-                utterance = [string]
+                utterances.append([string, self.getACSS(obj, string)])
                 if speakRole and not role in doNotSpeakRoles:
-                    utterance.extend(\
-                        self.speechGenerator.getRoleName(obj))
+                    utterance = self.speechGenerator.getRoleName(obj)
+                    if utterance:
+                        utterances.append(utterance)
   
             # If the object is a heading, or is contained within a heading,
             # speak that role information at the end of the object.
@@ -5316,12 +5317,10 @@ class Script(default.Script):
                         [pyatspi.ROLE_DOCUMENT_FRAME])
 
                 if heading:
-                    utterance.extend(\
-                        self.speechGenerator.getRoleName(heading))
+                    utterance = self.speechGenerator.getRoleName(heading)
+                    if utterance:
+                        utterances.append(utterance)
 
-            for item in utterance:
-                utterances.append([item, self.getACSS(obj, item)])
-  
             prevObj = obj
 
         return utterances
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 81745e4..348047d 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -1,6 +1,7 @@
 # Orca
 #
 # Copyright 2005-2009 Sun Microsystems Inc.
+# Copyright 2010 Orca Team.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -26,7 +27,7 @@ http://developer.mozilla.org/en/docs/Accessibility/ATSPI_Support
 __id__        = "$Id$"
 __version__   = "$Revision$"
 __date__      = "$Date$"
-__copyright__ = "Copyright (c) 2005-2009 Sun Microsystems Inc."
+__copyright__ = "Copyright (c) 2010 Orca Team."
 __license__   = "LGPL"
 
 import pyatspi
@@ -208,7 +209,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
     def _generateRoleName(self, obj, **args):
         """Prevents some roles from being spoken."""
         result = []
-        acss = self.voice(speech_generator.DEFAULT)
+        acss = self.voice(speech_generator.SYSTEM)
         role = args.get('role', obj.getRole())
         force = args.get('force', False)
 
diff --git a/test/html/FirefoxProfile/prefs.js b/test/html/FirefoxProfile/prefs.js
index de6703d..119ca10 100644
--- a/test/html/FirefoxProfile/prefs.js
+++ b/test/html/FirefoxProfile/prefs.js
@@ -30,7 +30,7 @@ user_pref("browser.tabs.warnOnClose", false);
 user_pref("browser.tabs.warnOnOpen", false);
 user_pref("browser.warnOnQuit", false);
 user_pref("dom.disable_window_status_change", false);
-user_pref("extensions.lastAppVersion", "3.6.2pre");
+user_pref("extensions.lastAppVersion", "4.0b7");
 user_pref("extensions.update.notifyUser", false);
 user_pref("extensions.update.enabled", false);
 user_pref("intl.charsetmenu.browser.cache", "UTF-8, ISO-8859-1");