WIP on keyboard. Some stuff not working!

1 files changed, 5 insertions, 1 deletions

diff --git a/lessonscreen.py b/lessonscreen.py
index 7e16e87..c5c8b6a 100644
--- a/lessonscreen.py
+++ b/lessonscreen.py
@@ -131,7 +131,7 @@ class LessonScreen(gtk.VBox):
         try:
             self.keyboard.load_letter_map('lessons/%s/%s.key' % (code, code))
         except:
-            self.keyboard.load_letter_map('lessons/en_US/en_US.key' % (code, code))
+            self.keyboard.load_letter_map('lessons/en_US/en_US.key')
 
         self.keyboard.set_layout(keyboard.OLPC_LAYOUT)
 
@@ -356,6 +356,10 @@ class LessonScreen(gtk.VBox):
         # Pass events on to the keyboard.
         self.keyboard.key_press_release_cb(widget, event)
 
+        # Ignore events which don't produce a character.
+        if not event.string:
+            return True
+
         # Ignore either press or release events, depending on mode.
         if self.mode == 'key' and event.type == gtk.gdk.KEY_PRESS:
             return True