summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Udaltsov <svu@gnome.org>2004-03-04 22:54:24 +0000
committerSergey Udaltsov <svu@gnome.org>2004-03-04 22:54:24 +0000
commitea3beb94b057f1b9f934d05565b9af3732007e5f (patch)
tree1a75d984a6978274762eb936deb2b5c326506af0
parent5c719419edc65321b63d0f2b6d31ac8dc6cebef9 (diff)
downloadlibxklavier-ea3beb94b057f1b9f934d05565b9af3732007e5f.tar.gz
fix for Solaris by Niall - though I still do not understand how dpy can be NULL
-rw-r--r--libxklavier/xklavier_xkb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libxklavier/xklavier_xkb.c b/libxklavier/xklavier_xkb.c
index 8e190fb..80f83cd 100644
--- a/libxklavier/xklavier_xkb.c
+++ b/libxklavier/xklavier_xkb.c
@@ -39,9 +39,14 @@ int XklInit( Display * a_dpy )
_xklDefaultErrHandler =
XSetErrorHandler( ( XErrorHandler ) _XklErrHandler );
+ if( !a_dpy )
+ {
+ return -1;
+ }
+ _xklDpy = a_dpy;
#ifdef XKB_HEADERS_PRESENT
/* Lets begin */
- _xklXkbExtPresent = XkbQueryExtension( _xklDpy = a_dpy,
+ _xklXkbExtPresent = XkbQueryExtension( _xklDpy,
&opcode, &_xklXkbEventType,
&_xklXkbError, NULL, NULL );
if( !_xklXkbExtPresent )