svn merge "^/branches/released" .

1 files changed, 6 insertions, 6 deletions

diff --git a/xorg-server/dix/selection.c b/xorg-server/dix/selection.c
index 947fc8d18..8763a2d5a 100644
--- a/xorg-server/dix/selection.c
+++ b/xorg-server/dix/selection.c
@@ -189,8 +189,7 @@ ProcSetSelectionOwner(ClientPtr client)
 	    event.u.selectionClear.time = time.milliseconds;

 	    event.u.selectionClear.window = pSel->window;

 	    event.u.selectionClear.atom = pSel->selection;

-	    TryClientEvents(pSel->client, NULL, &event, 1, NoEventMask,

-			    NoEventMask /* CantBeFiltered */, NullGrab);

+	    WriteEventsToClient(pSel->client, 1, &event);

 	}

     }

     else if (rc == BadMatch)

@@ -296,9 +295,11 @@ ProcConvertSelection(ClientPtr client)
 	event.u.selectionRequest.selection = stuff->selection;

 	event.u.selectionRequest.target = stuff->target;

 	event.u.selectionRequest.property = stuff->property;

-	if (TryClientEvents(pSel->client, NULL, &event, 1, NoEventMask,

-			    NoEventMask /* CantBeFiltered */, NullGrab))

+	if (pSel->client && pSel->client != serverClient && !pSel->client->clientGone)

+	{

+	    WriteEventsToClient(pSel->client, 1, &event);

 	    return Success;

+	}

     }

 

     event.u.u.type = SelectionNotify;

@@ -307,7 +308,6 @@ ProcConvertSelection(ClientPtr client)
     event.u.selectionNotify.selection = stuff->selection;

     event.u.selectionNotify.target = stuff->target;

     event.u.selectionNotify.property = None;

-    TryClientEvents(client, NULL, &event, 1, NoEventMask,

-		    NoEventMask /* CantBeFiltered */, NullGrab);

+    WriteEventsToClient(client, 1, &event);

     return Success;

 }