← Back to branch summary

~darkxst/ubuntu/raring/xorg-server/lp1073724

« back to all changes in this revision

Viewing changes to Xi/xichangehierarchy.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2011-12-20 11:39:51 UTC
  • mto: (0.10.23) (1.1.48)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: package-import@ubuntu.com-20111220113951-cx9svdcnqpcta5wk
Tags: upstream-1.11.99.2
Import upstream version 1.11.99.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
Xi/xichangehierarchy.c
200
200
    return rc;
201
201
}
202
202
 
 
203
static void
 
204
disable_clientpointer(DeviceIntPtr dev)
 
205
{
 
206
    int i;
 
207
 
 
208
    for (i = 0; i < currentMaxClients; i++)
 
209
    {
 
210
        ClientPtr client = clients[i];
 
211
        if (client && client->clientPtr == dev)
 
212
            client->clientPtr = NULL;
 
213
    }
 
214
}
 
215
 
203
216
static int
204
217
remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
205
218
              int flags[MAXDEVICES])
250
263
    if (rc != Success)
251
264
        goto unwind;
252
265
 
 
266
    disable_clientpointer(ptr);
 
267
 
253
268
    /* Disabling sends the devices floating, reattach them if
254
269
     * desired. */
255
270
    if (r->return_mode == XIAttachToMaster)