[orca] Fix for bug #660099 - Cannot re-bind Orca keybindings via the Preferences dialog

[Joanmarie Diggs <joanied src gnome org>]

commit 42198d81fab582fe582df6b922bde05b122039d5
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Nov 14 08:19:19 2011 -0500

    Fix for bug #660099 - Cannot re-bind Orca keybindings via the Preferences dialog

 configure.ac               |    2 +-
 src/orca/orca.py           |    5 ++---
 src/orca/orca_gui_prefs.py |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ddd7770..ff45271 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ m4_define([orca_version],
           [orca_major_version.orca_minor_version.orca_micro_version])
 
 m4_define(gtk_required_version, 3.1.91)
-m4_define(pygobject_required_version, 2.90.3)
+m4_define(pygobject_required_version, 3.0.2)
 m4_define(atspi_required_version, 2.1.92)
 
 AC_INIT([orca],
diff --git a/src/orca/orca.py b/src/orca/orca.py
index ecd57cd..c187083 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -1151,9 +1151,8 @@ def _processKeyCaptured(event):
             #
             keymap = Gdk.Keymap.get_default()
             entries_for_keycode = keymap.get_entries_for_keycode(event.hw_code)
-            success = entries_for_keycode[0]
-            entries = entries_for_keycode[1]
-            event.event_string = Gdk.keyval_name(entries[0].keycode)
+            entries = entries_for_keycode[-1]
+            event.event_string = Gdk.keyval_name(entries[0])
 
             if not event.event_string:
                 orca_state.capturingKeys = False
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index bcd976a..a729908 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -2969,7 +2969,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
             mods = self.newBinding.modifiers
             clickCount = self.newBinding.click_count
         except:
-            string = None
+            string = ''
             mods = 0
             clickCount = 1