Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSayamindu Dasgupta <sayamindu@gmail.com>2009-08-24 17:58:12 (GMT)
committer Sayamindu Dasgupta <sayamindu@gmail.com>2009-08-24 17:58:12 (GMT)
commitba4e50a2cfbf3d6db407c0e1406d078a29942719 (patch)
treeb420323aca7d7b2d2c67ec727a577ebae1e8612a
parentddfc2879a3088e0041c43ef8dc5888d0fde8bcb8 (diff)
Enable keyboard configuration stuff only if xklavier could be loaded
-rw-r--r--bin/sugar-session8
-rw-r--r--src/jarabe/controlpanel/gui.py5
2 files changed, 11 insertions, 2 deletions
diff --git a/bin/sugar-session b/bin/sugar-session
index 6685e19..278181a 100644
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -31,7 +31,6 @@ import gconf
import gtk
import gobject
import dbus.glib
-import xklavier
gtk.gdk.threads_init()
dbus.glib.threads_init()
@@ -200,7 +199,12 @@ def main():
gobject.idle_add(setup_notification_service_cb)
gobject.idle_add(setup_file_transfer_cb)
gobject.idle_add(show_software_updates_cb, home_window)
- gobject.idle_add(setup_keyboard_cb, client)
+
+ try:
+ import xklavier
+ gobject.idle_add(setup_keyboard_cb, client)
+ except ImportError:
+ logging.debug('Could not load xklavier for keyboard configuration')
try:
gtk.main()
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 3d226fa..33d0aff 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'],