diff options
-rw-r--r-- | bin/sugar-session | 8 | ||||
-rw-r--r-- | src/jarabe/controlpanel/gui.py | 5 |
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'], |