Re: Code freeze break request for Orca

[Frederic Peters <fpeters gnome org>]

Hi Joanmarie,

> I'm seeking a code freeze break request for today for bug 660091. It's a
> small, one-line change. Without this fix, users who have defined or
> redefined Orca keybindings stand an excellent chance of not being able
> to bring up Orca's Preferences dialog. :-/
> 
> Thanks in advance for your consideration.

Looks ok, +1.


        Fred

(patch attached for easier reading by other members)

>From 71f1a855fdff1724e3694171f59c181974497cef Mon Sep 17 00:00:00 2001
From: Joanmarie Diggs <joanmarie diggs gmail com>
Date: Mon, 26 Sep 2011 07:28:53 -0400
Subject: [PATCH] Fix for bug 660091 - Unbound alternative keybindings in
 user-settings.conf prevent the preferences window from
 being shown

---
 src/orca/orca_gui_prefs.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 313b84d..bcd976a 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -2045,7 +2045,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
                 if model.get(iterChild, DESCRIP)[0] == kb.handler.description:
                     exist = True
                     if not kb.keysymstring:
-                        text = None
+                        text = ''
                     else:
                         clickCount = self._clickCountToString(kb.click_count)
                         text = keybindings.getModifierNames(kb.modifiers) \
-- 
1.7.6.2