Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2125)
+++ ChangeLog	(working copy)
@@ -200,6 +200,40 @@
           def appendString(text, newText, delimiter=" "):
           def getUnicodeCurrencySymbols():
 
+        * src/orca/scripts/gedit.py
+          src/orca/scripts/planner.py
+          src/orca/scripts/gdmlogin.py
+          src/orca/scripts/liferea.py
+          src/orca/scripts/gcalctool.py
+          src/orca/scripts/gnome-power-manager.py
+          src/orca/scripts/Thunderbird.py
+          src/orca/scripts/gnome_segv2.py
+          src/orca/scripts/gaim.py
+          src/orca/scripts/gnome-terminal.py
+          src/orca/scripts/metacity.py
+          src/orca/scripts/acroread.py
+          src/orca/scripts/gnome-search-tool.py
+          src/orca/scripts/Evolution.py
+          src/orca/scripts/StarOffice.py
+          src/orca/scripts/gnome-keyring-ask.py
+          src/orca/scripts/users-admin.py
+          src/orca/flat_review.py
+          src/orca/speechgenerator.py
+          src/orca/orca.py
+          src/orca/default.py
+          src/orca/focus_tracking_presenter.py
+          src/orca/Gecko.py
+          src/orca/J2SE-access-bridge.py
+          src/orca/where_am_I.py
+          src/orca/hierarchical_presenter.py
+          src/orca/braille.py
+          src/orca/braillegenerator.py
+          src/orca/Makefile.am
+          src/orca/gnomespeechfactory.py
+          Another partial fix for bug #395548.
+          Removed all occurances of "import util" and a few cleanups.
+          Removed the util.py file.
+
 2007-03-05  Rich Burridge <rich.burridge@sun.com>
 
         * src/orca/debug.py:
Index: src/orca/scripts/gedit.py
===================================================================
--- src/orca/scripts/gedit.py	(revision 2122)
+++ src/orca/scripts/gedit.py	(working copy)
@@ -34,7 +34,6 @@
 import orca.rolenames as rolenames
 import orca.speech as speech
 import orca.speechgenerator as speechgenerator
-import orca.util as util
 
 from orca.orca_i18n import _
 
Index: src/orca/scripts/planner.py
===================================================================
--- src/orca/scripts/planner.py	(revision 2125)
+++ src/orca/scripts/planner.py	(working copy)
@@ -33,7 +33,6 @@
 import orca.braille as braille
 import orca.speech as speech
 import orca.settings as settings
-import orca.util as util
 import orca.speechgenerator as speechgenerator
 import orca.braillegenerator as braillegenerator
 
Index: src/orca/scripts/gdmlogin.py
===================================================================
--- src/orca/scripts/gdmlogin.py	(revision 2123)
+++ src/orca/scripts/gdmlogin.py	(working copy)
@@ -29,7 +29,6 @@
 import orca.atspi as atspi
 import orca.default as default
 import orca.orca as orca
-import orca.util as util
 
 ########################################################################
 #                                                                      #
Index: src/orca/scripts/liferea.py
===================================================================
--- src/orca/scripts/liferea.py	(revision 2122)
+++ src/orca/scripts/liferea.py	(working copy)
@@ -26,7 +26,6 @@
 import orca.orca_state as orca_state
 import orca.speech as speech
 import orca.settings as settings
-import orca.util as util
 import orca.speechgenerator as speechgenerator
 import orca.braillegenerator as braillegenerator
 import orca.eventsynthesizer as eventsynthesizer
Index: src/orca/scripts/gcalctool.py
===================================================================
--- src/orca/scripts/gcalctool.py	(revision 2121)
+++ src/orca/scripts/gcalctool.py	(working copy)
@@ -33,7 +33,6 @@
 import orca.rolenames as rolenames
 import orca.speech as speech
 import orca.speechgenerator as speechgenerator
-import orca.util as util
 
 ########################################################################
 #                                                                      #
Index: src/orca/scripts/gnome-power-manager.py
===================================================================
--- src/orca/scripts/gnome-power-manager.py	(revision 2121)
+++ src/orca/scripts/gnome-power-manager.py	(working copy)
@@ -31,7 +31,6 @@
 import orca.debug as debug
 import orca.settings as settings
 import orca.speech as speech
-import orca.util as util
 
 from orca.orca_i18n import _
 
Index: src/orca/scripts/Thunderbird.py
===================================================================
--- src/orca/scripts/Thunderbird.py	(revision 2122)
+++ src/orca/scripts/Thunderbird.py	(working copy)
@@ -36,7 +36,6 @@
 import orca.braillegenerator as braillegenerator
 import orca.speech as speech
 import orca.speechgenerator as speechgenerator
-import orca.util as util
 import orca.Gecko as Gecko
 
 from orca.orca_i18n import _
Index: src/orca/scripts/gnome_segv2.py
===================================================================
--- src/orca/scripts/gnome_segv2.py	(revision 2121)
+++ src/orca/scripts/gnome_segv2.py	(working copy)
@@ -33,7 +33,6 @@
 import orca.braille as braille
 import orca.speech as speech
 import orca.settings as settings
-import orca.util as util
 
 from orca.orca_i18n import _ # for gettext support
 
Index: src/orca/scripts/gaim.py
===================================================================
--- src/orca/scripts/gaim.py	(revision 2121)
+++ src/orca/scripts/gaim.py	(working copy)
@@ -42,7 +42,6 @@
 import orca.rolenames as rolenames
 import orca.settings as settings
 import orca.speech as speech
-import orca.util as util
 
 from orca.orca_i18n import _
 
Index: src/orca/scripts/gnome-terminal.py
===================================================================
--- src/orca/scripts/gnome-terminal.py	(revision 2123)
+++ src/orca/scripts/gnome-terminal.py	(working copy)
@@ -31,7 +31,6 @@
 import orca.debug as debug
 import orca.default as default
 import orca.input_event as input_event
-import orca.util as util
 import orca.orca_state as orca_state
 import orca.rolenames as rolenames
 import orca.settings as settings
Index: src/orca/scripts/metacity.py
===================================================================
--- src/orca/scripts/metacity.py	(revision 2121)
+++ src/orca/scripts/metacity.py	(working copy)
@@ -30,7 +30,6 @@
 import orca.rolenames as rolenames
 import orca.orca as orca
 import orca.speech as speech
-import orca.util as util
 
 from orca.orca_i18n import _
 
Index: src/orca/scripts/acroread.py
===================================================================
--- src/orca/scripts/acroread.py	(revision 2122)
+++ src/orca/scripts/acroread.py	(working copy)
@@ -36,7 +36,6 @@
 import orca.orca_state as orca_state
 import orca.settings as settings
 import orca.speech as speech
-import orca.util as util
 
 from orca.orca_i18n import _ # for gettext support
 
@@ -444,7 +443,7 @@
             utterances = self.speechGenerator.getSpeech(newLocusOfFocus, False)
             adjustedUtterances = []
             for utterance in utterances:
-                adjustedUtterances.append(util.adjustForRepeats(utterance))
+                adjustedUtterances.append(self.adjustForRepeats(utterance))
             speech.speakUtterances(adjustedUtterances)
             brailleRegions = \
                      self.brailleGenerator.getBrailleRegions(newLocusOfFocus)
@@ -664,7 +663,7 @@
             else:
                 voice = self.voices[settings.DEFAULT_VOICE]
 
-            word = util.adjustForRepeats(word)
+            word = self.adjustForRepeats(word)
             orca_state.lastWord = word
             speech.speak(word, voice)
             self.speakTextSelectionState(obj, startOffset, endOffset)
Index: src/orca/scripts/gnome-search-tool.py
===================================================================
--- src/orca/scripts/gnome-search-tool.py	(revision 2122)
+++ src/orca/scripts/gnome-search-tool.py	(working copy)
@@ -33,7 +33,6 @@
 import orca.braille as braille
 import orca.speech as speech
 import orca.settings as settings
-import orca.util as util
 
 from orca.orca_i18n import _ # for gettext support
 
Index: src/orca/scripts/Evolution.py
===================================================================
--- src/orca/scripts/Evolution.py	(revision 2122)
+++ src/orca/scripts/Evolution.py	(working copy)
@@ -35,7 +35,6 @@
 import orca.orca_state as orca_state
 import orca.speech as speech
 import orca.settings as settings
-import orca.util as util
 import orca.chnames as chnames
 
 from orca.orca_i18n import _ # for gettext support
@@ -390,7 +389,7 @@
             braille.displayMessage(string)
             if settings.enableSpeechIndentation:
                 self.speakTextIndentation(event.source, string)
-            line = util.adjustForRepeats(string)
+            line = self.adjustForRepeats(string)
                 
             if self.speakNewLine(event.source):
                 speech.speak(chnames.getCharacterName("\n"), None, False)
Index: src/orca/scripts/StarOffice.py
===================================================================
--- src/orca/scripts/StarOffice.py	(revision 2123)
+++ src/orca/scripts/StarOffice.py	(working copy)
@@ -39,7 +39,6 @@
 import orca.speechgenerator as speechgenerator
 import orca.settings as settings
 import orca.keybindings as keybindings
-import orca.util as util
 
 from orca.orca_i18n import _ # for gettext support
 
Index: src/orca/scripts/gnome-keyring-ask.py
===================================================================
--- src/orca/scripts/gnome-keyring-ask.py	(revision 2121)
+++ src/orca/scripts/gnome-keyring-ask.py	(working copy)
@@ -33,7 +33,6 @@
 import orca.braille as braille
 import orca.speech as speech
 import orca.settings as settings
-import orca.util as util
 
 from orca.orca_i18n import _ # for gettext support
 
Index: src/orca/scripts/users-admin.py
===================================================================
--- src/orca/scripts/users-admin.py	(revision 2124)
+++ src/orca/scripts/users-admin.py	(working copy)
@@ -29,7 +29,6 @@
 import orca.braille as braille
 import orca.braillegenerator as braillegenerator
 import orca.speechgenerator as speechgenerator
-import orca.util as util
 
 from orca.orca_i18n import _ # for gettext support
 
Index: src/orca/flat_review.py
===================================================================
--- src/orca/flat_review.py	(revision 2124)
+++ src/orca/flat_review.py	(working copy)
@@ -34,7 +34,6 @@
 import eventsynthesizer
 import orca_state
 import rolenames
-import util
 
 # [[[WDW - HACK Regular expression to split strings on whitespace
 # boundaries, which is what we'll use for word dividers instead of
Index: src/orca/util.py
===================================================================
--- src/orca/util.py	(revision 2121)
+++ src/orca/util.py	(working copy)
@@ -1,45 +0,0 @@
-# Orca
-#
-# Copyright 2005-2007 Sun Microsystems Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-"""Provides various utility functions for Orca."""
-
-__id__        = "$Id$"
-__version__   = "$Revision$"
-__date__      = "$Date$"
-__copyright__ = "Copyright (c) 2005-2007 Sun Microsystems Inc."
-__license__   = "LGPL"
-
-import string
-
-import atspi
-import chnames
-import debug
-import input_event
-import orca_prefs
-import orca_state
-import phonnames
-import punctuation_settings
-import pronunciation_dict
-import rolenames
-import settings
-import speech
-import speechserver
-
-from orca_i18n import _ # for gettext support
-
Index: src/orca/speechgenerator.py
===================================================================
--- src/orca/speechgenerator.py	(revision 2124)
+++ src/orca/speechgenerator.py	(working copy)
@@ -36,7 +36,6 @@
 import orca_state
 import rolenames
 import settings
-import util
 
 from orca_i18n import _                          # for gettext support
 
Index: src/orca/default.py
===================================================================
--- src/orca/default.py	(revision 2125)
+++ src/orca/default.py	(working copy)
@@ -61,7 +61,6 @@
 import speech
 import speechserver
 import string
-import util
 import where_am_I
 
 from orca_i18n import _                          # for gettext support
@@ -4758,7 +4757,7 @@
 
             if not self._display:
                 debug.println(debug.LEVEL_SEVERE,
-                              "util.drawOutline could not open display.")
+                              "Script.drawOutline could not open display.")
                 return
 
         screen = self._display.get_default_screen()
Index: src/orca/orca.py
===================================================================
--- src/orca/orca.py	(revision 2123)
+++ src/orca/orca.py	(working copy)
@@ -64,7 +64,6 @@
 import speech
 
 import threading
-import util
 
 from input_event import BrailleEvent
 from input_event import KeyboardEvent
@@ -724,7 +723,8 @@
                                                 orca_state.lastInputEvent,
                                                 keyboardEvent)
                     if clickCount == 2:
-                        util.phoneticSpellCurrentItem(keyboardEvent.event_string)
+                        orca_state.activeScript.phoneticSpellCurrentItem(\
+                            keyboardEvent.event_string)
                     else:
                         # Check to see if there are localized words to be
                         # spoken for this key event.
@@ -1057,7 +1057,7 @@
         # [[[WDW - comment out hierarchical_presenter for now.  It
         # relies on the list of known applications, and we've disabled
         # that due to a hang in a call to getChildAtIndex in
-        # util.getKnownApplications.]]]
+        # Script.getKnownApplications.]]]
         #
         #import focus_tracking_presenter
         #import hierarchical_presenter
Index: src/orca/focus_tracking_presenter.py
===================================================================
--- src/orca/focus_tracking_presenter.py	(revision 2121)
+++ src/orca/focus_tracking_presenter.py	(working copy)
@@ -40,7 +40,6 @@
 import rolenames
 import settings
 import speech
-import util
 
 from orca_i18n import _ # for gettext support
 
Index: src/orca/Gecko.py
===================================================================
--- src/orca/Gecko.py	(revision 2125)
+++ src/orca/Gecko.py	(working copy)
@@ -43,7 +43,6 @@
 import settings
 import speech
 import speechgenerator
-import util
 
 from orca_i18n import _
 
Index: src/orca/J2SE-access-bridge.py
===================================================================
--- src/orca/J2SE-access-bridge.py	(revision 2125)
+++ src/orca/J2SE-access-bridge.py	(working copy)
@@ -31,7 +31,6 @@
 import keybindings
 import settings
 import speech
-import util
 import rolenames
 import Accessibility
 import speechgenerator
Index: src/orca/where_am_I.py
===================================================================
--- src/orca/where_am_I.py	(revision 2124)
+++ src/orca/where_am_I.py	(working copy)
@@ -40,7 +40,6 @@
 import speechserver
 import Accessibility
 import math
-import util
 from orca_i18n import _ # for gettext support
 
 _debugLevel = debug.LEVEL_FINEST
Index: src/orca/hierarchical_presenter.py
===================================================================
--- src/orca/hierarchical_presenter.py	(revision 2121)
+++ src/orca/hierarchical_presenter.py	(working copy)
@@ -31,7 +31,6 @@
 import debug
 import orca_state
 import speech
-import util
 import presentation_manager
 
 from orca_i18n import _                          # for gettext support
Index: src/orca/braille.py
===================================================================
--- src/orca/braille.py	(revision 2125)
+++ src/orca/braille.py	(working copy)
@@ -65,7 +65,6 @@
 import eventsynthesizer
 import orca_state
 import settings
-import util
 
 from orca_i18n import _                          # for gettext support
 from rolenames import getShortBrailleForRoleName # localized role names
Index: src/orca/braillegenerator.py
===================================================================
--- src/orca/braillegenerator.py	(revision 2125)
+++ src/orca/braillegenerator.py	(working copy)
@@ -37,7 +37,6 @@
 import orca_state
 import rolenames
 import settings
-import util
 
 from orca_i18n import _                     # for gettext support
 
Index: src/orca/Makefile.am
===================================================================
--- src/orca/Makefile.am	(revision 2121)
+++ src/orca/Makefile.am	(working copy)
@@ -53,7 +53,6 @@
 	speech.py \
 	speechgenerator.py \
 	speechserver.py \
-	util.py \
 	where_am_I.py
 
 orca_pythondir=$(pyexecdir)/orca
Index: src/orca/gnomespeechfactory.py
===================================================================
--- src/orca/gnomespeechfactory.py	(revision 2125)
+++ src/orca/gnomespeechfactory.py	(working copy)
@@ -46,7 +46,6 @@
 import settings
 import speech
 import speechserver
-import util
 
 from acss import ACSS
 
