From 14f3fc0b83ee516d9631f4e41e3451ddc62e0024 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 19 Dec 2016 10:27:06 +0100 Subject: [PATCH] Use dixChangeWindowProperty() instead of ChangeWindowProperty() ChangeWindowProperty() was removed upstream because it was redundant, and dixChangeWindowProperty() has been around since 1.5 so we can safely use that. --- unix/xserver/hw/vnc/vncSelection.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/unix/xserver/hw/vnc/vncSelection.c b/unix/xserver/hw/vnc/vncSelection.c index e50548a4..6a8fdc31 100644 --- a/unix/xserver/hw/vnc/vncSelection.c +++ b/unix/xserver/hw/vnc/vncSelection.c @@ -230,23 +230,24 @@ static int vncConvertSelection(ClientPtr client, Atom selection, Atom targets[] = { xaTARGETS, xaTIMESTAMP, xaSTRING, xaTEXT, xaUTF8_STRING }; - rc = ChangeWindowProperty(pWin, realProperty, XA_ATOM, 32, - PropModeReplace, - sizeof(targets)/sizeof(targets[0]), - targets, TRUE); + rc = dixChangeWindowProperty(serverClient, pWin, realProperty, + XA_ATOM, 32, PropModeReplace, + sizeof(targets)/sizeof(targets[0]), + targets, TRUE); if (rc != Success) return rc; } else if (target == xaTIMESTAMP) { - rc = ChangeWindowProperty(pWin, realProperty, XA_INTEGER, 32, - PropModeReplace, 1, - &pSel->lastTimeChanged.milliseconds, - TRUE); + rc = dixChangeWindowProperty(serverClient, pWin, realProperty, + XA_INTEGER, 32, PropModeReplace, 1, + &pSel->lastTimeChanged.milliseconds, + TRUE); if (rc != Success) return rc; } else if ((target == xaSTRING) || (target == xaTEXT)) { - rc = ChangeWindowProperty(pWin, realProperty, XA_STRING, 8, - PropModeReplace, clientCutTextLen, - clientCutText, TRUE); + rc = dixChangeWindowProperty(serverClient, pWin, realProperty, + XA_STRING, 8, PropModeReplace, + clientCutTextLen, clientCutText, + TRUE); if (rc != Success) return rc; } else if (target == xaUTF8_STRING) { @@ -279,8 +280,9 @@ static int vncConvertSelection(ClientPtr client, Atom selection, } } - rc = ChangeWindowProperty(pWin, realProperty, xaUTF8_STRING, 8, - PropModeReplace, len, buffer, TRUE); + rc = dixChangeWindowProperty(serverClient, pWin, realProperty, + xaUTF8_STRING, 8, PropModeReplace, + len, buffer, TRUE); free(buffer); if (rc != Success) return rc; -- 2.39.5