andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: don't warn about duplicate core devices

Browse Source 
It doesn't matter. All devices are core pointer devices by default now
anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2011-07-04 13:44:44 +10:00
parent 033f53c223
commit 44d53728a6
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/common/xf86Config.c
View File

@ -1111,22 +1111,12 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
xf86CheckBoolOption(indp->options, "CorePointer", FALSE)) { xf86CheckBoolOption(indp->options, "CorePointer", FALSE)) {
if (!corePointer) { if (!corePointer) {
corePointer = indp; corePointer = indp;
} else {
xf86ReplaceBoolOption(indp->options, "CorePointer", FALSE);
xf86Msg(X_WARNING, "Duplicate core pointer devices. "
"Removing core pointer attribute from \"%s\"\n",
indp->name);
} }
} }
if (indp->options && if (indp->options &&
xf86CheckBoolOption(indp->options, "CoreKeyboard", FALSE)) { xf86CheckBoolOption(indp->options, "CoreKeyboard", FALSE)) {
if (!coreKeyboard) { if (!coreKeyboard) {
coreKeyboard = indp; coreKeyboard = indp;
} else {
xf86ReplaceBoolOption(indp->options, "CoreKeyboard", FALSE);
xf86Msg(X_WARNING, "Duplicate core keyboard devices. "
"Removing core keyboard attribute from \"%s\"\n",
indp->name);
} }
} }
count++; count++;