[orca/introspection] Remove the temporary hack-around for pygobject bug 657120.
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca/introspection] Remove the temporary hack-around for pygobject bug 657120.
- Date: Fri, 26 Aug 2011 03:00:38 +0000 (UTC)
commit 6be50cdcc8ec57f898ce18236f79c9b6214c4a72
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date: Thu Aug 25 14:47:07 2011 -0400
Remove the temporary hack-around for pygobject bug 657120.
src/orca/keybindings.py | 32 +------------------
src/orca/scripts/toolkits/CALLY/script.py | 18 +----------
.../scripts/toolkits/J2SE-access-bridge/script.py | 17 +----------
3 files changed, 4 insertions(+), 63 deletions(-)
---
diff --git a/src/orca/keybindings.py b/src/orca/keybindings.py
index 2b9a74e..3bbc438 100644
--- a/src/orca/keybindings.py
+++ b/src/orca/keybindings.py
@@ -60,21 +60,7 @@ def getAllKeysyms(keysym):
# level]).
#
keymap = Gdk.Keymap.get_default()
-
- # TODO - TODO - DO NOT COMMIT THIS TO MASTER!!! - TODO - TODO
- # Right now get_entries_for_keyval() segfaults. See bgo 657120.
- # We cannot work on the Orca introspection port if Orca hangs
- # every time we press a key. So for now, disable the offending
- # calls. This means, that all Orca cannot process its own key
- # commands or examine key events as part of the heuristic work
- # it must sometimes do. :-(
- #
- # success, entries = keymap.get_entries_for_keyval(keyval)
- #
- print 'WARNING: Call to get_entries_for_keyval() disabled'
- return _keysymsCache[keysym]
- # TODO: When bgo 657120 is fixed, re-enable the call to
- # get_entries_for_keyval() and nuke the above two lines.
+ success, entries = keymap.get_entries_for_keyval(keyval)
keycode = 0
if entries:
@@ -140,21 +126,7 @@ def getKeycode(keysym):
# entry is of the form [keycode, group, level]).
#
_keycodeCache[keysym] = 0
-
- # TODO - TODO - DO NOT COMMIT THIS TO MASTER!!! - TODO - TODO
- # Right now get_entries_for_keyval() segfaults. See bgo 657120.
- # We cannot work on the Orca introspection port if Orca hangs
- # every time we press a key. So for now, disable the offending
- # calls. This means, that all Orca cannot process its own key
- # commands or examine key events as part of the heuristic work
- # it must sometimes do. :-(
- #
- # success, entries = keymap.get_entries_for_keyval(keyval)
- #
- print 'WARNING: Call to get_entries_for_keyval() disabled'
- return _keycodeCache[keysym]
- # TODO: When bgo 657120 is fixed, re-enable the call to
- # get_entries_for_keyval() and nuke the above two lines.
+ success, entries = keymap.get_entries_for_keyval(keyval)
for entry in entries:
if entry.group == 0:
diff --git a/src/orca/scripts/toolkits/CALLY/script.py b/src/orca/scripts/toolkits/CALLY/script.py
index e30f5af..ecf4c98 100644
--- a/src/orca/scripts/toolkits/CALLY/script.py
+++ b/src/orca/scripts/toolkits/CALLY/script.py
@@ -139,24 +139,8 @@ class Script(default.Script):
keymap = Gdk.Keymap.get_default()
if keymap:
-
- # TODO - TODO - DO NOT COMMIT THIS TO MASTER!!! - TODO - TODO
- # Right now get_entries_for_keyval() segfaults. See bgo 657120.
- # We cannot work on the Orca introspection port if Orca hangs
- # every time we press a key. So for now, disable the offending
- # calls. This means, that all Orca cannot process its own key
- # commands or examime key events as part of the heuristic work
- # it must sometimes do. :-(
- #
- # success, entries = keymap.get_entries_for_keyval(keyval)
- #
- print 'WARNING: Call to get_entries_for_keyval() disabled'
- return default.Script.checkKeyboardEventData(self, keyboardEvent)
- # TODO: When bgo 657120 is fixed, re-enable the call to
- # get_entries_for_keyval() and nuke the above two lines.
-
+ success, entries = keymap.get_entries_for_keyval(keyval)
group = entries[0].group
-
keyval, egroup, level, consumed = \
keymap.translate_keyboard_state (keyboardEvent.hw_code,
keyboardEvent.modifiers,
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
index 9ad7043..0138b2a 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
@@ -95,22 +95,7 @@ class Script(default.Script):
keymap = Gdk.Keymap.get_default()
keyval = Gdk.keyval_from_name(keyboardEvent.keyval_name)
-
- # TODO - TODO - DO NOT COMMIT THIS TO MASTER!!! - TODO - TODO
- # Right now get_entries_for_keyval() segfaults. See bgo 657120.
- # We cannot work on the Orca introspection port if Orca hangs
- # every time we press a key. So for now, disable the offending
- # calls. This means, that all Orca cannot process its own key
- # commands or examine key events as part of the heuristic work
- # it must sometimes do. :-(
- #
- # success, entries = keymap.get_entries_for_keyval(keyval)
- #
- print 'WARNING: Call to get_entries_for_keyval() disabled'
- success, entries = False, []
- # TODO: When bgo 657120 is fixed, re-enable the call to
- # get_entries_for_keyval() and nuke the above two lines.
-
+ success, entries = keymap.get_entries_for_keyval(keyval)
for entry in entries:
if entry.group == 0:
keyboardEvent.hw_code = entry.keycode
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]