[orca/gnome-3-2] Fixed yet another post-introsepction unicode decode/encode error

[Joanmarie Diggs <joanied src gnome org>]

commit 3b4079a0cd0545c399ea896f2f42a5d1a9a717ed
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Dec 8 11:17:20 2011 -0500

    Fixed yet another post-introsepction unicode decode/encode error

 src/orca/orca_gui_prefs.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index a729908..60132e5 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -2087,8 +2087,13 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
                 text = None
             else:
                 clickCount = self._clickCountToString(kb.click_count)
+                modifierNames = keybindings.getModifierNames(kb.modifiers)
+                try:
+                    keysymstring = kb.keysymstring.encode('UTF-8')
+                except (UnicodeDecodeError, UnicodeEncodeError):
+                    keysymstring = kb.keysymstring
                 text = keybindings.getModifierNames(kb.modifiers) \
-                       + kb.keysymstring \
+                       + keysymstring \
                        + clickCount
 
             model.set_value(myiter, HANDLER, handl)