[orca] Remove some more missed obsolete state-changed code



commit 8d468fafe12bfd9c42e98bc447dcd4b87892f40c
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Nov 6 09:48:40 2013 -0500

    Remove some more missed obsolete state-changed code

 src/orca/scripts/apps/gedit/script.py              |    2 -
 src/orca/scripts/toolkits/CALLY/script.py          |   24 +-------------------
 .../scripts/toolkits/J2SE-access-bridge/script.py  |    9 -------
 3 files changed, 1 insertions(+), 34 deletions(-)
---
diff --git a/src/orca/scripts/apps/gedit/script.py b/src/orca/scripts/apps/gedit/script.py
index 0d2ab18..b125a7b 100644
--- a/src/orca/scripts/apps/gedit/script.py
+++ b/src/orca/scripts/apps/gedit/script.py
@@ -282,8 +282,6 @@ class Script(default.Script):
                      pyatspi.ROLE_PAGE_TAB,
                      pyatspi.ROLE_PAGE_TAB_LIST]
         if self.utilities.hasMatchingHierarchy(event.source, rolesList):
-            debug.println(self.debugLevel,
-                          "gedit.onStateChanged - print preview - page #.")
             parent = event.source.parent
             label1 = self.utilities.displayedText(parent[1])
             label2 = self.utilities.displayedText(parent[2])
diff --git a/src/orca/scripts/toolkits/CALLY/script.py b/src/orca/scripts/toolkits/CALLY/script.py
index 645a32e..ecf2f8d 100644
--- a/src/orca/scripts/toolkits/CALLY/script.py
+++ b/src/orca/scripts/toolkits/CALLY/script.py
@@ -327,29 +327,7 @@ class Script(default.Script):
 
         activeDialog, timestamp = self._activeDialog
         eType = event.type
-        if eType.startswith("object:state-changed:showing"):
-            # When entering overview with many open windows, we get quite
-            # a few state-changed:showing events for nameless panels. The
-            # act of processing these by the default script causes us to
-            # present nothing, and introduces a significant delay before
-            # presenting the Top Bar button when Ctrl+Alt+Tab was pressed.
-            if role == pyatspi.ROLE_PANEL and not name:
-                return
-
-            # We cannot count on events or their order from dialog boxes.
-            # Therefore, the only way to reliably present a dialog is by
-            # ignoring the events of the dialog itself and keeping track
-            # of the current dialog.
-            if not event.detail1 and event.source == activeDialog:
-                self._activeDialog = (None, 0)
-                self._activeDialogLabels = {}
-                return
-
-            if activeDialog and role == pyatspi.ROLE_LABEL and event.detail1:
-                if self.presentDialogLabel(event):
-                    return
-
-        elif eType.startswith("object:state-changed:focused") and event.detail1:
+        if eType.startswith("object:state-changed:focused") and event.detail1:
             # The dialog will get presented when its first child gets focus.
             if role == pyatspi.ROLE_DIALOG:
                 return
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py 
b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
index 591365f..3c45f80 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
@@ -267,15 +267,6 @@ class Script(default.Script):
                                 orca.setLocusOfFocus(event, item)
                                 return
 
-        # Present a value change in case of an focused popup menu.
-        # Fix for Swing file chooser.
-        #
-        if event.type.startswith("object:state-changed:visible") and \
-                event.source.getRole() == pyatspi.ROLE_POPUP_MENU and \
-                event.source.parent.getState().contains(pyatspi.STATE_FOCUSED):
-            orca.setLocusOfFocus(event, event.source.parent)
-            return
-
         default.Script.onStateChanged(self, event)
 
     def onValueChanged(self, event):


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