[orca] Fix for bug#642212 - Delay setting autostart until console UI is finished

[Joanmarie Diggs <joanied src gnome org>]

commit 03b6a60a1ab8589e4ab0ae7b13ec2e60d7bfdf44
Author: Mike Gorse <mgorse novell com>
Date:   Thu Feb 17 03:32:42 2011 -0600

    Fix for bug#642212 - Delay setting autostart until console UI is finished
    
    Delay setting the gconf key to automatically start Orca until the console
    UI is ready to exit, to avoid starting a new Orca instance while the console
    setup is still running.
    
    Use the settings manager accessor to set firstStart.
    
    Silence speech when prompting for the default keyboard, to be consistent
    with other prompts.

 src/orca/orca_console_prefs.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/orca_console_prefs.py b/src/orca/orca_console_prefs.py
index 921a5b7..94325a7 100644
--- a/src/orca/orca_console_prefs.py
+++ b/src/orca/orca_console_prefs.py
@@ -463,7 +463,7 @@ def setupSpeech(prefsDict):
     # layouts for how they might control Orca.
     #
     sayAndPrint(_("Select desired keyboard layout."),
-                False,
+                True,
                 False,
                 speechServerChoice,
                 speechVoiceChoice)
@@ -579,13 +579,13 @@ def showPreferencesUI(commandLineSettings):
                              speechServerChoice,
                              speechVoiceChoice)
         try:
-            settings.setOrcaAutostart(checkYes(answer))
+            autostart = checkYes(answer)
             break
         except:
             stop = False
             sayAndPrint(_("Please enter y or n."))
 
-    prefsDict['firstStart'] = False
+    _settingsManager.setFirstStart(False)
 
     # Sanity check for bug #642285
     #
@@ -624,6 +624,7 @@ def showPreferencesUI(commandLineSettings):
                                     speechServerChoice,
                                     speechVoiceChoice)
                         time.sleep(2)
+                        settings.setOrcaAutostart(autostart)
 
                         import gobject
                         gobject.threads_init()
@@ -644,6 +645,8 @@ def showPreferencesUI(commandLineSettings):
                          speechServerChoice,
                          speechVoiceChoice)
 
+    settings.setOrcaAutostart(autostart)
+
     for [factory, servers] in workingFactories:
         factory.SpeechServer.shutdownActiveServers()