diff options
| author | Keith Packard <keithp@keithp.com> | 2014-04-29 09:37:37 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-04-29 09:37:37 -0700 |
| commit | 6bd7ad914470322ddd02b50078e159234ebec643 (patch) | |
| tree | 951824893b7e1868c18cd3ee90a262c0721e08d4 | |
| parent | b92a9289fef4831e9af69e5f6f64b5454f550559 (diff) | |
| parent | e06fbe4dc81110e01d36f958849c4ab5f2a9df0e (diff) | |
Merge remote-tracking branch 'whot/for-keith'
| -rw-r--r-- | dix/devices.c | 5 | ||||
| -rw-r--r-- | dix/events.c | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/dix/devices.c b/dix/devices.c index ab923d574..73f60f46e 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1475,7 +1475,6 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc) PtrFeedbackPtr feedc; BUG_RETURN_VAL(dev == NULL, FALSE); - BUG_RETURN_VAL(dev->ptrfeed != NULL, FALSE); feedc = malloc(sizeof(PtrFeedbackClassRec)); if (!feedc) @@ -1519,7 +1518,6 @@ InitStringFeedbackClassDeviceStruct(DeviceIntPtr dev, StringFeedbackPtr feedc; BUG_RETURN_VAL(dev == NULL, FALSE); - BUG_RETURN_VAL(dev->stringfeed != NULL, FALSE); feedc = malloc(sizeof(StringFeedbackClassRec)); if (!feedc) @@ -1556,7 +1554,6 @@ InitBellFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc, BellFeedbackPtr feedc; BUG_RETURN_VAL(dev == NULL, FALSE); - BUG_RETURN_VAL(dev->bell != NULL, FALSE); feedc = malloc(sizeof(BellFeedbackClassRec)); if (!feedc) @@ -1578,7 +1575,6 @@ InitLedFeedbackClassDeviceStruct(DeviceIntPtr dev, LedCtrlProcPtr controlProc) LedFeedbackPtr feedc; BUG_RETURN_VAL(dev == NULL, FALSE); - BUG_RETURN_VAL(dev->leds != NULL, FALSE); feedc = malloc(sizeof(LedFeedbackClassRec)); if (!feedc) @@ -1601,7 +1597,6 @@ InitIntegerFeedbackClassDeviceStruct(DeviceIntPtr dev, IntegerFeedbackPtr feedc; BUG_RETURN_VAL(dev == NULL, FALSE); - BUG_RETURN_VAL(dev->intfeed != NULL, FALSE); feedc = malloc(sizeof(IntegerFeedbackClassRec)); if (!feedc) diff --git a/dix/events.c b/dix/events.c index 125a0ee29..7e7a1c9eb 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4260,12 +4260,6 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev, thisDev); } if (!deliveries) { - /* XXX: In theory, we could pass the internal events through to - * everything and only convert just before hitting the wire. We can't - * do that yet, so DGE is the last stop for internal events. From here - * onwards, we deal with core/XI events. - */ - sendCore = (IsMaster(thisDev) && thisDev->coreEvents); /* try core event */ if ((sendCore && grab->grabtype == CORE) || grab->grabtype != CORE) |