From e687e11b1248494a45b9a4e4c321675526808703 Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Wed, 21 Oct 2009 21:46:50 -0400 Subject: Revert "Remove some debug messages that trigger on XACE event delivery failure." The log messages still need to be there for non-XACE failures. This reverts commit 4be354c4c2da5168b302601b91bd80cfaca7e193. Signed-off-by: Eamon Walsh Reviewed-by: Keith Packard --- dix/events.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dix/events.c b/dix/events.c index c085a75f3..aecf72686 100644 --- a/dix/events.c +++ b/dix/events.c @@ -2494,7 +2494,9 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab, filter, grab); if (deliveries > 0) goto unwind; - } + } else if (rc != BadMatch) + ErrorF("[dix] %s: XI conversion failed in DDE (%d, %d). Skipping delivery.\n", + dev->name, event->any.type, rc); } /* Core event */ @@ -2510,7 +2512,9 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab, filter, grab); if (deliveries > 0) goto unwind; - } + } else if (rc != BadMatch) + ErrorF("[dix] %s: Core conversion failed in DDE (%d, %d).\n", + dev->name, event->any.type, rc); } if ((deliveries < 0) || (pWin == stopAt) || @@ -3794,7 +3798,9 @@ DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window) deliveries = DeliverEventsToWindow(keybd, focus, &core, 1, GetEventFilter(keybd, &core), NullGrab); - } + } else if (rc != BadMatch) + ErrorF("[dix] %s: core conversion failed DFE (%d, %d). Skipping delivery.\n", + keybd->name, event->any.type, rc); } unwind: -- cgit v1.2.3