diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2004-03-16 22:37:16 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2004-03-16 22:37:16 +0000 |
| commit | a2c62f214d84cd80aef5704bd13c7985a2ee7fa7 (patch) | |
| tree | 323dac29a654611533cb66d33bd565ba63efd49c | |
| parent | d26526dbf6f2d229f31243447697766c28530300 (diff) | |
| download | libxklavier-a2c62f214d84cd80aef5704bd13c7985a2ee7fa7.tar.gz | |
Cleaner patch for the improper display - along with some debug print, by Jody
| -rw-r--r-- | libxklavier/xklavier_xkb.c | 10 |
1 files 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 |