[orca/gnome-3-36] Fix regression reading content resulting from cherry-pick



commit 3be5b5be469d58f1cd33145b14e97b4e8d691f1f
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Aug 11 17:53:24 2020 +0200

    Fix regression reading content resulting from cherry-pick
    
    The cherry-picked commit from master expected priorObj as an optional
    argument to useFocusMode, but the change introducing that argument
    was only included in master.

 src/orca/scripts/apps/SeaMonkey/script.py   | 2 +-
 src/orca/scripts/apps/Thunderbird/script.py | 2 +-
 src/orca/scripts/web/script.py              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/scripts/apps/SeaMonkey/script.py b/src/orca/scripts/apps/SeaMonkey/script.py
index 3b5f34954..94a2a3881 100644
--- a/src/orca/scripts/apps/SeaMonkey/script.py
+++ b/src/orca/scripts/apps/SeaMonkey/script.py
@@ -104,7 +104,7 @@ class Script(Gecko.Script):
 
         super().onFocus(event)
 
-    def useFocusMode(self, obj):
+    def useFocusMode(self, obj, prevObj=None):
         if self.utilities.isEditableMessage(obj):
             msg = "SEAMONKEY: Using focus mode for editable message %s" % obj
             debug.println(debug.LEVEL_INFO, msg, True)
diff --git a/src/orca/scripts/apps/Thunderbird/script.py b/src/orca/scripts/apps/Thunderbird/script.py
index 8ebdeb974..1e86665fb 100644
--- a/src/orca/scripts/apps/Thunderbird/script.py
+++ b/src/orca/scripts/apps/Thunderbird/script.py
@@ -130,7 +130,7 @@ class Script(Gecko.Script):
 
         super().locusOfFocusChanged(event, oldFocus, newFocus)
 
-    def useFocusMode(self, obj):
+    def useFocusMode(self, obj, prevObj=None):
         if self.utilities.isEditableMessage(obj):
             msg = "THUNDERBIRD: Using focus mode for editable message %s" % obj
             debug.println(debug.LEVEL_INFO, msg, True)
diff --git a/src/orca/scripts/web/script.py b/src/orca/scripts/web/script.py
index 72d445c4e..c105635bf 100644
--- a/src/orca/scripts/web/script.py
+++ b/src/orca/scripts/web/script.py
@@ -778,7 +778,7 @@ class Script(default.Script):
 
         return self._browseModeIsSticky
 
-    def useFocusMode(self, obj):
+    def useFocusMode(self, obj, prevObj=None):
         """Returns True if we should use focus mode in obj."""
 
         if self._focusModeIsSticky:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]