From 6afd512d55dacc16758428d15dd06dd41ce8f889 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 09 Mar 2007 12:47:17 +0000
Subject: Cleanup kbd config passing

---
(limited to 'sugar-emulator')

diff --git a/sugar-emulator b/sugar-emulator
index 98e51d3..c87dc71 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -47,17 +47,21 @@ else:
     program = sys.argv[1]
 
 if gtk.gdk.screen_width() < 1200 or gtk.gdk.screen_height() < 900:
-    fullscreen = True
     width = -1
     height = -1
 else:
-    fullscreen = False
     width = 1200
     height = 900
 
 dpi = min(_sugar.get_screen_dpi(), 96)
 
-emulator = Emulator(width, height, fullscreen, dpi)
+if sourcedir:
+    kbd_config = os.path.join(sourcedir, 'shell/data/kbdconfig')
+else:
+    kbd_config = os.path.join(env.get_data_dir(), 'kbdconfig')
+
+emulator = Emulator(width, height, dpi)
+emulator.set_keyboard_config(kbd_config)
 emulator.start()
 
 if sourcedir:
--
cgit v0.9.1