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/Window.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/Window.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index ecf662f90..aa8831055 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -422,7 +422,7 @@ Bool nxagentCreateWindow(WindowPtr pWin) if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) { - Atom prop = nxagentMakeAtom("WM_PROTOCOLS", strlen("WM_PROTOCOLS"), True); + XlibAtom prop = nxagentMakeAtom("WM_PROTOCOLS", strlen("WM_PROTOCOLS"), True); XlibAtom atom = nxagentMakeAtom("WM_DELETE_WINDOW", strlen("WM_DELETE_WINDOW"), True); XSetWMProtocols(nxagentDisplay, nxagentWindowPriv(pWin)->window, &atom, 1); @@ -3054,8 +3054,7 @@ static void nxagentReconnectWindow(void * param0, XID param1, void * data_buffer { if (nxagentWindowTopLevel(pWin)) { - Atom prop = nxagentMakeAtom("WM_PROTOCOLS", strlen("WM_PROTOCOLS"), True); - + XlibAtom prop = nxagentMakeAtom("WM_PROTOCOLS", strlen("WM_PROTOCOLS"), True); XlibAtom atom = nxagentMakeAtom("WM_DELETE_WINDOW", strlen("WM_DELETE_WINDOW"), True); XSetWMProtocols(nxagentDisplay, nxagentWindow(pWin), &atom, 1); |