From fec479f03d60db13da362f50c3c715168fef7ba4 Mon Sep 17 00:00:00 2001
From: Sayamindu Dasgupta <sayamindu@gmail.com>
Date: Tue, 25 Aug 2009 17:16:50 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/sugar/sugar-xkb-support

---
(limited to 'src')

diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 7384a0d..39f9c4a 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -134,6 +134,11 @@ class ControlPanel(gtk.Window):
         if not os.path.exists('/ofw'):
             options.remove('power')
 
+        try:
+            import xklavier
+        except ImportError:
+            options.remove('keyboard')
+
         for option in options:
             sectionicon = _SectionIcon(icon_name=self._options[option]['icon'],
                                        title=self._options[option]['title'],
--
cgit v0.9.1