← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to hw/dmx/input/dmxcommon.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/dmx/input/dmxcommon.c
483
483
    GETPRIVFROMPDEV;
484
484
    GETDMXINPUTFROMPRIV;
485
485
 
486
 
    if (!priv) return -1;
487
486
    priv->eventMask |= DMX_POINTER_EVENT_MASK;
488
487
    if (dmxShadowFB) {
489
488
        XWarpPointer(priv->display, priv->window, priv->window,
509
508
    GETPRIVFROMPDEV;
510
509
    GETDMXINPUTFROMPRIV;
511
510
    
512
 
    if (!priv) return;
513
511
    priv->eventMask &= ~DMX_POINTER_EVENT_MASK;
514
512
    if (!priv->be) {
515
513
        RemoveEnabledDevice(XConnectionNumber(priv->display));