[orca/gnome-3-14] Set the caret position before speaking the character at that position

[Joanmarie Diggs <joanied src gnome org>]

commit d2548578b03e021b89a6eef1801f2381cd5e8477
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sun Sep 14 20:54:39 2014 -0400

    Set the caret position before speaking the character at that position
    
    Otherwise the locusOfFocus might not be this object

 src/orca/scripts/toolkits/Gecko/script.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 642f1c1..896b413 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -2658,10 +2658,9 @@ class Script(default.Script):
 
         if not obj:
             [obj, characterOffset] = self.getBottomOfFile()
-        else:
-            self.speakCharacterAtOffset(obj, characterOffset)
 
         self.setCaretPosition(obj, characterOffset)
+        self.speakCharacterAtOffset(obj, characterOffset)
         self.updateBraille(obj)
 
     def goPreviousCharacter(self, inputEvent):
@@ -2677,10 +2676,9 @@ class Script(default.Script):
 
         if not obj:
             [obj, characterOffset] = self.getTopOfFile()
-        else:
-            self.speakCharacterAtOffset(obj, characterOffset)
 
         self.setCaretPosition(obj, characterOffset)
+        self.speakCharacterAtOffset(obj, characterOffset)
         self.updateBraille(obj)
 
     def goPreviousWord(self, inputEvent):