diff -Nur libXi-1.0.2.orig/src/XExtInt.c libXi-1.0.2/src/XExtInt.c
--- libXi-1.0.2.orig/src/XExtInt.c	2006-11-08 15:20:05.000000000 +0100
+++ libXi-1.0.2/src/XExtInt.c	2007-04-06 22:08:46.000000000 +0200
@@ -205,7 +205,7 @@
 	    return (-1);
 	}
 	((XInputData *) info->data)->vers =
-	    _XiGetExtensionVersion(dpy, "XInputExtension");
+	    _XiGetExtensionVersion(dpy, "XInputExtension", info);
     }
 
     if (versions[version_index].major_version > Dont_Check) {
diff -Nur libXi-1.0.2.orig/src/XGetVers.c libXi-1.0.2/src/XGetVers.c
--- libXi-1.0.2.orig/src/XGetVers.c	2006-11-08 15:20:05.000000000 +0100
+++ libXi-1.0.2/src/XGetVers.c	2007-04-06 22:08:46.000000000 +0200
@@ -64,9 +64,10 @@
 XGetExtensionVersion(register Display * dpy, _Xconst char *name)
 {
     XExtensionVersion *ext;
+    XExtDisplayInfo *info = XInput_find_display(dpy);
 
     LockDisplay(dpy);
-    ext = _XiGetExtensionVersion(dpy, name);
+    ext = _XiGetExtensionVersion(dpy, name, info);
     if (ext != (XExtensionVersion *) NoSuchExtension) {
 	UnlockDisplay(dpy);
 	SyncHandle();
@@ -75,12 +76,11 @@
 }
 
 XExtensionVersion *
-_XiGetExtensionVersion(register Display * dpy, _Xconst char *name)
+_XiGetExtensionVersion(register Display * dpy, _Xconst char *name, XExtDisplayInfo *info)
 {
     xGetExtensionVersionReq *req;
     xGetExtensionVersionReply rep;
     XExtensionVersion *ext;
-    XExtDisplayInfo *info = XInput_find_display(dpy);
 
     if (_XiCheckExtInit(dpy, Dont_Check, info) == -1)
 	return ((XExtensionVersion *) NoSuchExtension);
diff -Nur libXi-1.0.2.orig/src/XIint.h libXi-1.0.2/src/XIint.h
--- libXi-1.0.2.orig/src/XIint.h	2006-11-08 15:20:05.000000000 +0100
+++ libXi-1.0.2/src/XIint.h	2007-04-06 22:08:46.000000000 +0200
@@ -12,6 +12,6 @@
 
 extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *);
 
-extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *);
+extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *);
 
 #endif