From b73021905669b080fc7d23e91e3c2538801259c1 Mon Sep 17 00:00:00 2001
From: Sayamindu Dasgupta <sayamindu@gmail.com>
Date: Tue, 25 Aug 2009 16:06:31 +0000
Subject: Abort if display could not be opened.

---
(limited to 'bin')

diff --git a/bin/sugar-session b/bin/sugar-session
index 278181a..6a5e9a4 100644
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -133,7 +133,13 @@ def setup_file_transfer_cb():
 def setup_keyboard_cb(gconf_client):
     logging.debug('STARTUP: setup_keyboard_cb')
     try:
-        engine = xklavier.Engine(gtk.gdk.display_get_default())
+        display = gtk.gdk.display_get_default()
+        if display is not None:
+            engine = xklavier.Engine(display)
+        else:
+            logging.debug('setup_keyboard_cb: Could not get default display.')
+            return
+
         configrec = xklavier.ConfigRec()
         configrec.get_from_server(engine)
 
--
cgit v0.9.1