[orca/orca-gnome3: 77/87] Replacing speech imports in several files

[Alejandro Leiva <aleiva src gnome org>]

commit 6ae9e7bd3ceb39b231e1338d805ec61e6b6ce67f
Author: Javier Hernández Antúnez <jhernandez emergya es>
Date:   Thu Mar 31 20:16:10 2011 +0200

    Replacing speech imports in several files

 src/orca/app_gui_prefs.py |    4 +++-
 src/orca/bookmarks.py     |    5 ++++-
 src/orca/chat.py          |    5 ++++-
 src/orca/liveregions.py   |    6 +++++-
 src/orca/where_am_I.py    |    5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/src/orca/app_gui_prefs.py b/src/orca/app_gui_prefs.py
index 9fbe66b..a57261e 100644
--- a/src/orca/app_gui_prefs.py
+++ b/src/orca/app_gui_prefs.py
@@ -41,12 +41,14 @@ import orca_gui_prefs
 import orca_prefs
 import orca_state
 import orca_platform
-import speech
 
 from orca_i18n import _  # for gettext support
 
 _scriptManager = getattr(orca, '_scriptManager')
 _settingsManager = getattr(orca, '_settingsManager')
+_pluginManager = getattr(orca, '_pluginManager')
+
+speech = _pluginManager.getPluginObject('speech')
 
 applicationName = None
 appScript = None
diff --git a/src/orca/bookmarks.py b/src/orca/bookmarks.py
index 3bdb437..be26f7e 100644
--- a/src/orca/bookmarks.py
+++ b/src/orca/bookmarks.py
@@ -23,12 +23,15 @@ import pickle
 import os
 
 import rolenames
-import speech
 import settings
 import orca_state
 
 from orca_i18n import _
 
+import orca
+
+_pluginManager = getattr(orca, '_pluginManager')
+speech = _pluginManager.getPluginObject('speech')
 
 class Bookmarks:
     """Represents a default bookmark handler."""
diff --git a/src/orca/chat.py b/src/orca/chat.py
index b41513b..eaf1146 100644
--- a/src/orca/chat.py
+++ b/src/orca/chat.py
@@ -32,11 +32,14 @@ import keybindings
 import orca
 import orca_state
 import settings
-import speech
 
 from orca_i18n import _
 
 _settingsManager = getattr(orca, '_settingsManager')
+_pluginManager = getattr(orca, '_pluginManager')
+
+speech = _pluginManager.getPluginObject('speech')
+
 
 #############################################################################
 #                                                                           #
diff --git a/src/orca/liveregions.py b/src/orca/liveregions.py
index 3b225c7..0faff15 100644
--- a/src/orca/liveregions.py
+++ b/src/orca/liveregions.py
@@ -2,9 +2,13 @@ import bisect
 import gobject
 import orca_state
 import pyatspi
-import speech
 import copy
 import time
+import orca
+
+_pluginManager = getattr(orca, '_pluginManager')
+
+speech = _pluginManager.getPluginObject('speech')
 
 from orca_i18n import _
 
diff --git a/src/orca/where_am_I.py b/src/orca/where_am_I.py
index 5dc7e64..06da0c9 100644
--- a/src/orca/where_am_I.py
+++ b/src/orca/where_am_I.py
@@ -27,7 +27,10 @@ __license__   = "LGPL"
 
 import pyatspi
 import debug
-import speech
+import orca
+
+_pluginManager = getattr(orca, '_pluginManager')
+speech = _pluginManager.getPluginObject('speech')
 
 # [[[TODO: WDW - need to handle the old _speakText functionality that changes
 # settings.verbalizePunctuationStyle = settings.PUNCTUATION_STYLE_SOME