← Back to branch summary

~chasedouglas/ubuntu/maverick/xorg-server/multitouch

« back to all changes in this revision

Viewing changes to dix/devices.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Julien Cristau, Christopher James Halse Rogers
  • Date: 2010-06-07 23:22:48 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607232248-x9ob0sjy8bwkc2ki
Tags: 2:1.8.1.901-1
[ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-2.

[ Christopher James Halse Rogers ]
* 16-xaa-fbcomposite-fix-negative-size.diff:
  - mi hunk merged upstream.  Update to keep just the fbpict.c hunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dix/devices.c
318
318
        }
319
319
    }
320
320
 
321
 
    /* Before actually enabling the device, we need to make sure the event
322
 
     * list's events have enough memory for a ClassesChangedEvent from the
323
 
     * device
324
 
     */
325
321
    if ((*prev != dev) || !dev->inited ||
326
322
        ((ret = (*dev->deviceProc)(dev, DEVICE_ON)) != Success)) {
327
323
        ErrorF("[dix] couldn't enable device %d\n", dev->id);
474
470
 
475
471
    /* Initialize memory for sprites. */
476
472
    if (IsMaster(dev) && dev->spriteInfo->spriteOwner)
477
 
        pScreen->DeviceCursorInitialize(dev, pScreen);
 
473
        if (!pScreen->DeviceCursorInitialize(dev, pScreen))
 
474
            ret = BadAlloc;
478
475
 
479
476
    SendDevicePresenceEvent(dev->id, DeviceAdded);
480
477
    if (sendevent)
857
854
    }
858
855
 
859
856
    if (DevHasCursor(dev) && dev->spriteInfo->sprite) {
 
857
        if (dev->spriteInfo->sprite->current)
 
858
            FreeCursor(dev->spriteInfo->sprite->current, None);
860
859
        xfree(dev->spriteInfo->sprite->spriteTrace);
861
860
        xfree(dev->spriteInfo->sprite);
862
861
    }