diff options
author | Sayamindu Dasgupta <sayamindu@gmail.com> | 2009-09-16 17:42:41 (GMT) |
---|---|---|
committer | Sayamindu Dasgupta <sayamindu@gmail.com> | 2009-09-16 17:42:41 (GMT) |
commit | d8872c7095b9b73b0c48d21d07cc4793fcc3b626 (patch) | |
tree | b8543834ee0af7a43aec5b68a7daed9de92b8b5e /bin | |
parent | 9406c42ed10a149d31e06a8db06806463d6f18c8 (diff) |
Fix xklavier import. Fixes dslo#1326
Diffstat (limited to 'bin')
-rw-r--r-- | bin/sugar-session | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/sugar-session b/bin/sugar-session index 317c3b4..eb38fb8 100644 --- a/bin/sugar-session +++ b/bin/sugar-session @@ -32,6 +32,11 @@ import gtk import gobject import dbus.glib +try: + import xklavier +except ImportError: + logging.debug('Could not load xklavier for keyboard configuration') + gtk.gdk.threads_init() dbus.glib.threads_init() @@ -208,12 +213,9 @@ def main(): gobject.idle_add(setup_notification_service_cb) gobject.idle_add(setup_file_transfer_cb) gobject.idle_add(show_software_updates_cb) - - try: - import xklavier + + if sys.modules.has_key('xklavier'): gobject.idle_add(setup_keyboard_cb, client) - except ImportError: - logging.debug('Could not load xklavier for keyboard configuration') try: gtk.main() |