merge ^/branches/released .

1 files changed, 4 insertions, 6 deletions

diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 3164e397e..627badda6 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -2373,10 +2373,10 @@ RecalculateMasterButtons(DeviceIntPtr slave)
  * Generate release events for all keys/button currently down on this

  * device.

  */

-static void

+void

 ReleaseButtonsAndKeys(DeviceIntPtr dev)

 {

-    EventListPtr        eventlist = InitEventList(GetMaximumEventsNum());

+    InternalEvent*      eventlist = InitEventList(GetMaximumEventsNum());

     ButtonClassPtr      b = dev->button;

     KeyClassPtr         k = dev->key;

     int                 i, j, nevents;

@@ -2391,7 +2391,7 @@ ReleaseButtonsAndKeys(DeviceIntPtr dev)
         {

             nevents = GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, NULL);

             for (j = 0; j < nevents; j++)

-                mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);

+                mieqProcessDeviceEvent(dev, &eventlist[j], NULL);

         }

     }

 

@@ -2402,7 +2402,7 @@ ReleaseButtonsAndKeys(DeviceIntPtr dev)
         {

             nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i, NULL);

             for (j = 0; j < nevents; j++)

-                mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);

+                mieqProcessDeviceEvent(dev, &eventlist[j], NULL);

         }

     }

 

@@ -2442,8 +2442,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
         free(dev->spriteInfo->sprite);

     }

 

-    ReleaseButtonsAndKeys(dev);

-

     oldmaster = GetMaster(dev, MASTER_ATTACHED);

     dev->master = master;