]> git.pld-linux.org Git - packages/XFree86.git/commitdiff
- from xfree86 cvs; should fix problem with startup
authorMichal Moskal <michal@moskal.me>
Sat, 30 Aug 2003 12:45:18 +0000 (12:45 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    XFree86-core_pointer.patch -> 1.1

XFree86-core_pointer.patch [new file with mode: 0644]

diff --git a/XFree86-core_pointer.patch b/XFree86-core_pointer.patch
new file mode 100644 (file)
index 0000000..baf5379
--- /dev/null
@@ -0,0 +1,31 @@
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v
+retrieving revision 3.272
+retrieving revision 3.273
+diff -u -p -r3.272 -r3.273
+--- xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2003/08/24 20:52:30     3.272
++++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2003/08/27 02:50:25     3.273
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.271 2003/08/24 17:36:50 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.272 2003/08/24 20:52:30 dawes Exp $ */
+ /*
+@@ -1451,7 +1451,7 @@ checkCoreInputDevices(serverLayoutPtr se
+       indp[count - 1].extraOptions = xf86addNewOption(NULL, "CorePointer", NULL);
+       indp[count].identifier = NULL;
+       servlayoutp->inputs = indp;
+-    } else {
++    } else if (!havePointer) {
+       /* This should never happen. */
+       xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n");
+       return FALSE;
+@@ -1473,7 +1473,7 @@ checkCoreInputDevices(serverLayoutPtr se
+       indp[count - 1].extraOptions = xf86addNewOption(NULL, "CoreKeyboard", NULL);
+       indp[count].identifier = NULL;
+       servlayoutp->inputs = indp;
+-    } else {
++    } else if (!haveKeyboard) {
+       /* This should never happen. */
+       xf86Msg(X_ERROR, "Cannot locate a core keyboard device\n");
+       return FALSE;
This page took 0.104537 seconds and 4 git commands to generate.