[orca] Bring the WebKitGtk and Gecko getObjectsFromEOCs() method signatures into alignment

[Joanmarie Diggs <joanied src gnome org>]

commit 2d624723a6811160efa582ab3e0072e472b18d1e
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Dec 19 10:58:25 2012 +0100

    Bring the WebKitGtk and Gecko getObjectsFromEOCs() method signatures into alignment

 src/orca/label_inference.py                        |    2 +-
 src/orca/script_utilities.py                       |    4 ++--
 .../scripts/toolkits/Gecko/script_utilities.py     |    5 ++++-
 src/orca/scripts/toolkits/WebKitGtk/script.py      |    6 +++---
 .../scripts/toolkits/WebKitGtk/script_utilities.py |    4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/src/orca/label_inference.py b/src/orca/label_inference.py
index 3ff0d00..c40d53a 100644
--- a/src/orca/label_inference.py
+++ b/src/orca/label_inference.py
@@ -245,7 +245,7 @@ class LabelInference:
             obj = obj.parent
 
         boundary = pyatspi.TEXT_BOUNDARY_LINE_START
-        rv = self._script.utilities.getObjectsFromEOCs(obj, boundary, start)
+        rv = self._script.utilities.getObjectsFromEOCs(obj, start, boundary)
         self._lineCache[key] = rv
 
         return rv
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index b4ed4ab..cb03eaf 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -2942,14 +2942,14 @@ class Utilities:
             debug.printException(debug.LEVEL_WARNING)
             return ""
 
-    def getObjectsFromEOCs(self, obj, boundary=None, offset=None):
+    def getObjectsFromEOCs(self, obj, offset=None, boundary=None):
         """Breaks the string containing a mixture of text and embedded object
         characters into a list of (obj, startOffset, endOffset, string) tuples.
 
         Arguments
         - obj: the object whose EOCs we need to expand into tuples
-        - boundary: the pyatspi text boundary type. If None, get all text.
         - offset: the character offset. If None, use the current offset.
+        - boundary: the pyatspi text boundary type. If None, get all text.
 
         Returns a list of (obj, startOffset, endOffset, string) tuples.
         """
diff --git a/src/orca/scripts/toolkits/Gecko/script_utilities.py b/src/orca/scripts/toolkits/Gecko/script_utilities.py
index 888dbd6..a659b41 100644
--- a/src/orca/scripts/toolkits/Gecko/script_utilities.py
+++ b/src/orca/scripts/toolkits/Gecko/script_utilities.py
@@ -498,7 +498,7 @@ class Utilities(script_utilities.Utilities):
     #                                                                       #
     #########################################################################
 
-    def getObjectsFromEOCs(self, obj, offset, boundary=None):
+    def getObjectsFromEOCs(self, obj, offset=None, boundary=None):
         """Expands the current object replacing EMBEDDED_OBJECT_CHARACTERS
         with [obj, startOffset, endOffset, string] tuples.
 
@@ -527,6 +527,9 @@ class Utilities(script_utilities.Utilities):
         objects = []
         text = self.queryNonEmptyText(obj)
         if text:
+            if offset == None:
+                offset = text.caretOffset
+
             if boundary:
                 [string, start, end] = \
                     text.getTextAfterOffset(offset, boundary)
diff --git a/src/orca/scripts/toolkits/WebKitGtk/script.py b/src/orca/scripts/toolkits/WebKitGtk/script.py
index d1a8604..7148393 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/script.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/script.py
@@ -376,7 +376,7 @@ class Script(default.Script):
         """
 
         boundary = pyatspi.TEXT_BOUNDARY_CHAR
-        objects = self.utilities.getObjectsFromEOCs(obj, boundary)
+        objects = self.utilities.getObjectsFromEOCs(obj, boundary=boundary)
         for (obj, start, end, string) in objects:
             if string:
                 speech.speakCharacter(string)
@@ -391,7 +391,7 @@ class Script(default.Script):
         """
 
         boundary = pyatspi.TEXT_BOUNDARY_WORD_START
-        objects = self.utilities.getObjectsFromEOCs(obj, boundary)
+        objects = self.utilities.getObjectsFromEOCs(obj, boundary=boundary)
         for (obj, start, end, string) in objects:
             self.sayPhrase(obj, start, end)
 
@@ -403,7 +403,7 @@ class Script(default.Script):
         """
 
         boundary = pyatspi.TEXT_BOUNDARY_LINE_START
-        objects = self.utilities.getObjectsFromEOCs(obj, boundary)
+        objects = self.utilities.getObjectsFromEOCs(obj, boundary=boundary)
         for (obj, start, end, string) in objects:
             self.sayPhrase(obj, start, end)
 
diff --git a/src/orca/scripts/toolkits/WebKitGtk/script_utilities.py b/src/orca/scripts/toolkits/WebKitGtk/script_utilities.py
index befb0ff..c390893 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/script_utilities.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/script_utilities.py
@@ -112,14 +112,14 @@ class Utilities(script_utilities.Utilities):
 
         return text
 
-    def getObjectsFromEOCs(self, obj, boundary=None, offset=None):
+    def getObjectsFromEOCs(self, obj, offset=None, boundary=None):
         """Breaks the string containing a mixture of text and embedded object
         characters into a list of (obj, startOffset, endOffset, string) tuples.
 
         Arguments
         - obj: the object whose EOCs we need to expand into tuples
-        - boundary: the pyatspi text boundary type. If None, get all text.
         - offset: the character offset. If None, use the current offset.
+        - boundary: the pyatspi text boundary type. If None, get all text.
 
         Returns a list of (obj, startOffset, endOffset, string) tuples.
         """