[orca/new-settings] Get Orca's text-based setup to work with the settings manager.

[Joanmarie Diggs <joanied src gnome org>]

commit a8531ddae38fa30ae8ec345995bcfdfaeb59f60a
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Thu Oct 28 15:30:42 2010 -0400

    Get Orca's text-based setup to work with the settings manager.

 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 93e682b..f9fe21e 100644
--- a/src/orca/orca_console_prefs.py
+++ b/src/orca/orca_console_prefs.py
@@ -32,6 +32,7 @@ import acss
 import settings
 import speech
 import speechserver
+import orca
 import orca_prefs
 import time
 
@@ -49,6 +50,8 @@ workingFactories   = []
 speechServerChoice = None
 speechVoiceChoice  = None
 
+_settingsManager = getattr(orca, '_settingsManager')
+
 # Translators: this is a regular expression that is intended to match
 # a positive 'yes' response from a user at the command line.  The expression
 # as given means - does it begin with (that's the '^' character) any of
@@ -318,8 +321,8 @@ def setupSpeech(prefsDict):
     }
 
     prefsDict["enableSpeech"] = True
-    prefsDict["speechServerFactory"] = factory
-    prefsDict["speechServerInfo"] = speechServerChoice
+    prefsDict["speechServerFactory"] = factory.__name__
+    prefsDict["speechServerInfo"] = speechServerChoice.getInfo()
     prefsDict["voices"] = voices
 
     stop = True
@@ -583,7 +586,7 @@ def showPreferencesUI(commandLineSettings):
             sayAndPrint(_("Please enter y or n."))
 
     prefsDict['firstStart'] = False
-    logoutNeeded = orca_prefs.writePreferences(prefsDict)
+    logoutNeeded = _settingsManager.saveSettings(prefsDict, {}, {})
     if logoutNeeded:
         sayAndPrint(_("Accessibility support for GNOME has just been enabled."),
                     logoutNeeded,