From d8872c7095b9b73b0c48d21d07cc4793fcc3b626 Mon Sep 17 00:00:00 2001
From: Sayamindu Dasgupta <sayamindu@gmail.com>
Date: Wed, 16 Sep 2009 17:42:41 +0000
Subject: Fix xklavier import. Fixes dslo#1326

---
(limited to 'bin')

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()
--
cgit v0.9.1