[orca/new-settings] Solve several issues with the 'firstStart' and profile settings.
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca/new-settings] Solve several issues with the 'firstStart' and profile settings.
- Date: Wed, 20 Oct 2010 02:40:07 +0000 (UTC)
commit 7d391ae67e616bc8bcc922e763160eda5d25273b
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date: Tue Oct 19 22:38:12 2010 -0400
Solve several issues with the 'firstStart' and profile settings.
1. gconf_backend.py is calling the setting firstStart; settings.py was
calling it setFirstStart.
2. If there is no gconf key in existance, we were seeing a traceback
due to a type error.
3. _getValueForKey() doesn't know about this setting, resulting in
tracebacks and failures.
4. Issue 3 holds true for 'activeProfile' and 'startingProfile'.
I'm not sure if the check I added is the RightThingToDo(tm), but
until I get past the tracebacks, it's difficult to know.... In the
spirit of small changes....
src/orca/backends/gconf_backend.py | 5 +++--
src/orca/settings.py | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/backends/gconf_backend.py b/src/orca/backends/gconf_backend.py
index 12ccc09..ad88ba1 100644
--- a/src/orca/backends/gconf_backend.py
+++ b/src/orca/backends/gconf_backend.py
@@ -768,7 +768,7 @@ class OrcaPrefs():
self.__app_key += '/%s' % activeProfileName
for key in settings.userCustomizableSettings:
- if key != 'voices':
+ if key not in ['voices', 'firstStart']:
self.prefsDict[key] = self._getValueForKey(self.prefsDict, key)
if key in self.need2repr:
self.prefsDict[key] = self._fix_quotes(self.prefsDict[key])
@@ -859,7 +859,8 @@ class OrcaPrefs():
# problem with the speechServerInfo. I haven't added handling
# below. Just getting things working in the environment for now.
#
- if key not in ['voices', 'speechServerFactory']:
+ if key not in ['voices', 'speechServerFactory', 'firstStart',
+ 'activeProfile', 'startingProfile']:
#value = self._getValueForKey(self.settingsDict, key)
value = self.settingsDict[key]
if value != None:
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 64bfc31..e82889b 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -201,7 +201,7 @@ userCustomizableSettings = [
"presentTimeFormat",
"activeProfile",
"startingProfile",
- "setFirstStart"
+ "firstStart"
]
# The name of the module that hold the user interface for the main window
@@ -240,7 +240,7 @@ activeProfile = ['Default', 'default']
# First start?
#
-setFirstStart = True
+firstStart = True
# A list of keys that can serve as the Orca modifier key. The list is
# so we can provide better cross platform support (e.g., Sun keyboard
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]