From a2c62f214d84cd80aef5704bd13c7985a2ee7fa7 Mon Sep 17 00:00:00 2001
From: Sergey Udaltsov <svu@gnome.org>
Date: Tue, 16 Mar 2004 22:37:16 +0000
Subject: Cleaner patch for the improper display - along with some debug print,
 by Jody

---
 libxklavier/xklavier_xkb.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libxklavier/xklavier_xkb.c b/libxklavier/xklavier_xkb.c
index 80f83cd..31050f9 100644
--- a/libxklavier/xklavier_xkb.c
+++ b/libxklavier/xklavier_xkb.c
@@ -36,13 +36,15 @@ int XklInit( Display * a_dpy )
   int opcode;
   int scr;
 
-  _xklDefaultErrHandler =
-    XSetErrorHandler( ( XErrorHandler ) _XklErrHandler );
-
   if( !a_dpy )
   {
+    XklDebug( 10, "XklInit : display is NULL ?\n");
     return -1;
   }
+
+  _xklDefaultErrHandler =
+    XSetErrorHandler( ( XErrorHandler ) _XklErrHandler );
+
   _xklDpy = a_dpy;
 #ifdef XKB_HEADERS_PRESENT
   /* Lets begin */
@@ -51,6 +53,8 @@ int XklInit( Display * a_dpy )
                                          &_xklXkbError, NULL, NULL );
   if( !_xklXkbExtPresent )
   {
+    _xklDpy = NULL;
+    XSetErrorHandler( ( XErrorHandler ) _xklDefaultErrHandler );
     return -1;
   }
 #endif
-- 
cgit v1.2.1