Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSayamindu Dasgupta <sayamindu@gmail.com>2009-08-25 17:16:50 (GMT)
committer Sayamindu Dasgupta <sayamindu@gmail.com>2009-08-25 17:16:50 (GMT)
commitfec479f03d60db13da362f50c3c715168fef7ba4 (patch)
treea7dc35864d87c00fe6662cd698d6ee22b4c3e524 /src
parent85b833960ded9148fbb42e773720ba3bcb02145e (diff)
parente9aca4836414cc4942b6120dc3bc0d7722f30c40 (diff)
Merge branch 'master' of git://git.sugarlabs.org/sugar/sugar-xkb-support
Diffstat (limited to 'src')
-rw-r--r--src/jarabe/controlpanel/gui.py5
1 files changed, 5 insertions, 0 deletions
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'],