[orca/gnome-2-28] Fix for bgo#604956 - Certain speech settings get improperly restored to default when setting up Orca

[Joanmarie Diggs <joanied src gnome org>]

commit 1aff1252fd04712bef7dd7047cc29f9f4c4fb095
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Dec 21 01:43:08 2009 -0500

    Fix for bgo#604956 - Certain speech settings get improperly restored to default when setting up Orca initially

 src/orca/orca_gui_prefs.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index fe625ba..0a4ce32 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -153,6 +153,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         self.savedGain = None
         self.savedPitch = None
         self.savedRate = None
+        self._isInitialSetup = False
 
     def init(self):
         """Initialize the Orca configuration GUI. Read the users current
@@ -439,6 +440,9 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
                         self._initComboBox(self.get_widget("speechFamilies"))
         self._initSpeechState()
 
+        path = os.path.join(settings.userPrefsDir, "user-settings.py")
+        self._isInitialSetup = not os.path.exists(path)
+
         self._initGUIState()
 
     def _getACSSForVoiceType(self, voiceType):
@@ -4243,7 +4247,8 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         - widget: the component that generated the signal.
         """
 
-        self.restoreSettings()
+        if not self._isInitialSetup:
+            self.restoreSettings()
 
         enable = self.get_widget("speechSupportCheckbutton").get_active()
         self.prefsDict["enableSpeech"] = enable