[orca] Speak all popovers that emit object:state-changed:showing

[Joanmarie Diggs <joanied src gnome org>]

commit 9094f7047d34b3a6c7fa7280636cc39c085e9b75
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Feb 22 12:06:13 2016 -0500

    Speak all popovers that emit object:state-changed:showing

 src/orca/script_utilities.py                      |   15 ++++++++++++++-
 src/orca/scripts/toolkits/gtk/script.py           |    2 +-
 src/orca/scripts/toolkits/gtk/script_utilities.py |   10 +---------
 3 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 04671ce..9a4347f 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -3208,9 +3208,22 @@ class Utilities:
     def isEntryCompletionPopupItem(self, obj):
         return False
 
-    def _isNonModalPopOver(self, obj):
+    def isPopOver(self, obj):
         return False
 
+    def isNonModalPopOver(self, obj):
+        if not self.isPopOver(obj):
+            return False
+
+        try:
+            state = obj.getState()
+        except:
+            msg = "ERROR: Exception getting state for %s" % obj
+            debug.println(debug.LEVEL_INFO, msg, True)
+            return False
+
+        return not state.contains(pyatspi.STATE_MODAL)
+
     def rgbFromString(self, attributeValue):
         regex = re.compile("rgb|[^\w,]", re.IGNORECASE)
         string = re.sub(regex, "", attributeValue)
diff --git a/src/orca/scripts/toolkits/gtk/script.py b/src/orca/scripts/toolkits/gtk/script.py
index 4445056..29326ff 100644
--- a/src/orca/scripts/toolkits/gtk/script.py
+++ b/src/orca/scripts/toolkits/gtk/script.py
@@ -212,7 +212,7 @@ class Script(default.Script):
             return
 
         obj = event.source
-        if self.utilities._isNonModalPopOver(obj) \
+        if self.utilities.isPopOver(obj) \
            or obj.getRole() in [pyatspi.ROLE_ALERT, pyatspi.ROLE_INFO_BAR]:
             if obj.parent and obj.parent.getRole() == pyatspi.ROLE_APPLICATION:
                 return
diff --git a/src/orca/scripts/toolkits/gtk/script_utilities.py 
b/src/orca/scripts/toolkits/gtk/script_utilities.py
index 6d2899e..e719b3c 100644
--- a/src/orca/scripts/toolkits/gtk/script_utilities.py
+++ b/src/orca/scripts/toolkits/gtk/script_utilities.py
@@ -79,15 +79,7 @@ class Utilities(script_utilities.Utilities):
 
         return False
 
-    def _isNonModalPopOver(self, obj):
-        try:
-            state = obj.getState()
-        except:
-            return False
-
-        if state.contains(pyatspi.STATE_MODAL):
-            return False
-
+    def isPopOver(self, obj):
         try:
             relations = obj.getRelationSet()
         except: