[orca] Fix for bug #640072 - Orca crashes receiving a message from Pidgin
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Fix for bug #640072 - Orca crashes receiving a message from Pidgin
- Date: Fri, 21 Jan 2011 05:55:06 +0000 (UTC)
commit fc5b9f835da5a5a71fdcfc202532eba1a1146449
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date: Fri Jan 21 00:53:25 2011 -0500
Fix for bug #640072 - Orca crashes receiving a message from Pidgin
src/orca/script.py | 9 ++++++---
src/orca/settings_manager.py | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/orca/script.py b/src/orca/script.py
index f1a0f58..25b86f2 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -47,7 +47,6 @@ import flat_review
import formatting
import keybindings
import orca_state
-import script_manager
import script_utilities
import settings
import speech_generator
@@ -332,11 +331,15 @@ class Script:
whether or not the script is active.
"""
+ import orca
+ _scriptManager = getattr(orca, '_scriptManager')
+ _settingsManager = getattr(orca, '_settingsManager')
+
scriptSettings = settings
if orca_state.activeScript != self:
- name = script_manager.getModuleName(self.app)
+ name = _scriptManager.getModuleName(self.app)
if name:
- for package in settings.settingsPackages:
+ for package in _settingsManager.settingsPackages:
name = package + "." + name
try:
module = __import__(name, globals(), locals(), [''])
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index 4207fcd..1d1f751 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -121,7 +121,7 @@ class SettingsManager(object):
self.setProfile(self.profile)
# For handling the currently-"classic" application settings
- self._settingsPackages = ["app-settings"]
+ self.settingsPackages = ["app-settings"]
self._knownAppSettings = {}
def _loadBackend(self):
@@ -495,7 +495,7 @@ class SettingsManager(object):
return
module = None
- for package in self._settingsPackages:
+ for package in self.settingsPackages:
name = '.'.join((package, moduleName))
debug.println(debug.LEVEL_FINEST, "Looking for %s.py" % name)
try:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]