[caribou] Add changes from window.py to make preferences work

[Benjamin Konrath <bkonrath src gnome org>]

commit c66b6b04f51c6c9b47ad2f2ca952f6d05e302d64
Author: Ben Konrath <ben bagu org>
Date:   Tue Jan 26 19:29:41 2010 -0500

    Add changes from window.py to make preferences work

 src/caribou/window.py |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/src/caribou/window.py b/src/caribou/window.py
index a3171fd..f6cd5e7 100644
--- a/src/caribou/window.py
+++ b/src/caribou/window.py
@@ -18,15 +18,12 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+import animation
+import gconf
 import gtk
 import gtk.gdk as gdk
-import glib
 import keyboard
-import keyboards
-import gconf
-import animation
 import opacity
-import sys
 
 class CaribouWindow(gtk.Window):
     __gtype_name__ = "CaribouWindow"
@@ -39,10 +36,8 @@ class CaribouWindow(gtk.Window):
         self._vbox = gtk.VBox()
         self.add(self._vbox)
 
-        name = "caribou.keyboards.qwerty"
-        __import__(name)
-        kbddef = sys.modules[name]
-        self._vbox.pack_start(keyboard.CaribouKeyboard(kbddef))
+        # we only have a keyboard widget right now
+        self._vbox.pack_start(keyboard.CaribouKeyboard())
 
         self.connect("size-allocate", lambda w, a: self._update_position())
         self._gconf_client = gconf.client_get_default()