[orca/gnome-3-14] Fix for bug 742293 - Application-specific shortcut rebinding doesn't persist

[Joanmarie Diggs <joanied src gnome org>]

commit 4f7491da9dea5e7e4d1b1a056f0bd8540646f2f6
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Jan 5 12:17:04 2015 -0500

    Fix for bug 742293 - Application-specific shortcut rebinding doesn't persist

 src/orca/scripts/default.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index e0b17d3..7eb57d8 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -624,6 +624,13 @@ class Script(script.Script):
         for keyBinding in bindings.keyBindings:
             keyBindings.add(keyBinding)
 
+        try:
+            keyBindings = _settingsManager.overrideKeyBindings(self, keyBindings)
+        except:
+            debug.println(debug.LEVEL_WARNING,
+                          "WARNING: problem overriding keybindings:")
+            debug.printException(debug.LEVEL_WARNING)
+
         return keyBindings
 
     def getDefaultKeyBindings(self):
@@ -643,13 +650,6 @@ class Script(script.Script):
         import orca.common_keyboardmap as common_keyboardmap
         keyBindings.load(common_keyboardmap.keymap, self.inputEventHandlers)
 
-        try:
-            keyBindings = _settingsManager.overrideKeyBindings(self, keyBindings)
-        except:
-            debug.println(debug.LEVEL_WARNING,
-                          "WARNING: problem overriding keybindings:")
-            debug.printException(debug.LEVEL_WARNING)
-
         return keyBindings
 
     def getBrailleBindings(self):