Xi: free XkbSrvLedInfos as well when freeing an MD's device classes.

This commit is contained in:
Peter Hutterer 2007-11-15 11:31:43 +10:30
parent c758e5a664
commit b05246696d

View File

@ -278,14 +278,23 @@ ChangeMasterDeviceClasses(DeviceIntPtr device,
#endif
xfree(master->key); master->key = NULL;
xfree(master->valuator); master->valuator = NULL;
/* XXX: xkb_acts needs to be freed for master->button */
xfree(master->button); master->button = NULL;
xfree(master->focus); master->focus = NULL;
xfree(master->proximity); master->proximity = NULL;
xfree(master->absolute); master->absolute = NULL;
#ifdef XKB
if (master->kbdfeed && master->kbdfeed->xkb_sli)
XkbFreeSrvLedInfo(master->kbdfeed->xkb_sli);
#endif
xfree(master->kbdfeed); master->kbdfeed = NULL;
xfree(master->ptrfeed); master->ptrfeed = NULL;
xfree(master->stringfeed); master->stringfeed = NULL;
xfree(master->bell); master->bell = NULL;
#ifdef XKB
if (master->leds && master->leds->xkb_sli)
XkbFreeSrvLedInfo(master->leds->xkb_sli);
#endif
xfree(master->leds); master->leds = NULL;
xfree(master->intfeed); master->intfeed = NULL;