orca r3805 - in trunk: . src/orca

[richb svn gnome org]

Author: richb
Date: Fri Apr  4 21:55:53 2008
New Revision: 3805
URL: http://svn.gnome.org/viewvc/orca?rev=3805&view=rev

Log:
        * src/orca/orca.py:
          src/orca/orca_console_prefs.py:
          Fixed bug #523082 - text-setup should not use speech if 
          --disable=speech is used.


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

Modified: trunk/src/orca/orca.py
==============================================================================
--- trunk/src/orca/orca.py	(original)
+++ trunk/src/orca/orca.py	Fri Apr  4 21:55:53 2008
@@ -1013,7 +1013,7 @@
                             globals(),
                             locals(),
                             [''])
-        module.showPreferencesUI()
+        module.showPreferencesUI(_commandLineSettings)
     except:
         debug.printException(debug.LEVEL_SEVERE)
 

Modified: trunk/src/orca/orca_console_prefs.py
==============================================================================
--- trunk/src/orca/orca_console_prefs.py	(original)
+++ trunk/src/orca/orca_console_prefs.py	Fri Apr  4 21:55:53 2008
@@ -427,12 +427,14 @@
                         False,                 # Fast
                         True)                  # All apps save state
 
-def showPreferencesUI():
+def showPreferencesUI(commandLineSettings):
     """Uses the console to query the user for Orca preferences."""
 
     prefsDict = {}
 
-    if not setupSpeech(prefsDict):
+    if ("enableSpeech" in commandLineSettings and \
+        not commandLineSettings["enableSpeech"]) or \
+       (not setupSpeech(prefsDict)):
         prefsDict["enableSpeech"]     = False
         prefsDict["enableEchoByWord"] = False
         prefsDict["enableKeyEcho"]    = False