[caribou: 9/14] Removed caribou/keyboards

[Eitan Isaacson <eitani src gnome org>]

commit b4fe863c6bdba31fd417daab0aacae221eb88cf7
Author: Joaquim Rocha <jrocha igalia com>
Date:   Wed May 26 11:49:22 2010 +0200

    Removed caribou/keyboards
    
    Removed the caribou/keyboards folder and all mentions to it in
    the other files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=613229

 caribou/Makefile.am            |    2 -
 caribou/keyboard.py            |   24 +++++-----
 caribou/keyboards/Makefile.am  |   12 -----
 caribou/keyboards/__init__.py  |   31 -------------
 caribou/keyboards/keysyms.py   |   33 --------------
 caribou/keyboards/qwerty.py    |   91 -------------------------------------
 caribou/keyboards/qwerty_es.py |   86 -----------------------------------
 caribou/keyboards/qwerty_sv.py |   97 ----------------------------------------
 configure.ac                   |    1 -
 9 files changed, 12 insertions(+), 365 deletions(-)
---
diff --git a/caribou/Makefile.am b/caribou/Makefile.am
index dda528c..9095ab9 100644
--- a/caribou/Makefile.am
+++ b/caribou/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = keyboards
-
 cariboudir = $(pkgpythondir)/
 
 caribou_PYTHON = \
diff --git a/caribou/keyboard.py b/caribou/keyboard.py
index f6f3d96..db5f5f7 100644
--- a/caribou/keyboard.py
+++ b/caribou/keyboard.py
@@ -37,7 +37,6 @@ else:
 import xml.etree.ElementTree as ET
 from xml.dom import minidom
 
-import keyboards
 from . import data_path
 
 NORMAL_KEY_TYPE = 'normal'
@@ -81,17 +80,18 @@ class KeyboardPreferences:
         layout_combo = builder.get_object("combobox_layout")
         layout_combo.connect("changed", self._on_layout_changed, client)
 
-        for kbddef in keyboards.kbds:
-            layout_combo.append_text(kbddef)
-
-        defaultkbd = client.get_string("/apps/caribou/osk/layout")
-        try:
-            index = keyboards.kbds.index(defaultkbd)
-        except ValueError:
-            print "FIXME: pick a suitable keyboard layout: " + (defaultkbd or "None")
-            layout_combo.set_active(0)
-        else:
-            layout_combo.set_active(index)
+        #TODO: List the layouts in the data dir
+        #for kbddef in keyboards.kbds:
+        #    layout_combo.append_text(kbddef)
+
+        #defaultkbd = client.get_string("/apps/caribou/osk/layout")
+        #try:
+        #    index = keyboards.kbds.index(defaultkbd)
+        #except ValueError:
+        #    print "FIXME: pick a suitable keyboard layout: " + (defaultkbd or "None")
+        #    layout_combo.set_active(0)
+        #else:
+        #    layout_combo.set_active(index)
 
         # grey out the key size, key spacing and test area
         # TODO: implement key size, key spacing and test area
diff --git a/configure.ac b/configure.ac
index ee5210a..6713d4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,6 @@ AC_OUTPUT([
 Makefile
 po/Makefile.in
 caribou/Makefile
-caribou/keyboards/Makefile
 caribou/i18n.py
 bin/Makefile
 bin/caribou