diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 22:59:43 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 22:59:43 +0100 |
| commit | 04962efa95a41cd6f665ebb110a7ce07d99a4554 (patch) | |
| tree | 1d319a61f55dd6132c17b5e7cb45b4585c3b6160 /nx-X11/programs/Xserver/hw/nxagent/Rootless.c | |
| parent | a261b72435d7d30dbe36529a51fc53f6ade34dff (diff) | |
| parent | 427b7b9777727df4115e3e9e6e63d5176fb0b495 (diff) | |
| download | nx-libs-04962efa95a41cd6f665ebb110a7ce07d99a4554.tar.gz nx-libs-04962efa95a41cd6f665ebb110a7ce07d99a4554.tar.bz2 nx-libs-04962efa95a41cd6f665ebb110a7ce07d99a4554.zip | |
Merge branch 'uli42-pr/xlib_types' into 3.6.x
Attributes GH PR #883: https://github.com/ArcticaProject/nx-libs/pull/883
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 364e076e6..86e3c9ca7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -706,8 +706,8 @@ int nxagentExportProperty(WindowPtr pWin, if (export) { - Atom propertyX = nxagentLocalToRemoteAtom(property); - Atom typeX = nxagentLocalToRemoteAtom(type); + XlibAtom propertyX = nxagentLocalToRemoteAtom(property); + XlibAtom typeX = nxagentLocalToRemoteAtom(type); if (propertyX == None || typeX == None) { @@ -794,8 +794,8 @@ int nxagentExportProperty(WindowPtr pWin, } void nxagentImportProperty(Window window, - Atom property, - Atom type, + XlibAtom property, + XlibAtom type, int format, unsigned long nitems, unsigned long bytes_after, @@ -1001,7 +1001,7 @@ void nxagentImportProperty(Window window, else if (strcmp(typeS, "ATOM") == 0) { Atom *atoms = malloc(nitems * sizeof(Atom)); - Atom *input = (Atom*) buffer; + XlibAtom *input = (XlibAtom*) buffer; if (atoms == NULL) { @@ -1107,7 +1107,7 @@ void nxagentImportProperty(Window window, struct nxagentPropertyRec{ Window window; - Atom property; + XlibAtom property; struct nxagentPropertyRec *next; }; @@ -1148,7 +1148,7 @@ void nxagentRemovePropertyFromList(void) * Add the record to the list. */ -void nxagentAddPropertyToList(Atom property, WindowPtr pWin) +void nxagentAddPropertyToList(XlibAtom property, WindowPtr pWin) { if (NXDisplayError(nxagentDisplay) == 1) { |