diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
| commit | b66699555d2e2503926f01a9c192481e01812399 (patch) | |
| tree | fa7f275b0bc74c3ed8e85538602ed8b6a8a0f4c2 /nx-X11/programs/Xserver/hw/nxagent/Display.c | |
| parent | 3523d15e2a9f84e2136e3370129a9bea0e16e072 (diff) | |
| parent | 97a69b95ac3018f9a8838b09df28a0f33c484a0d (diff) | |
| download | nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.gz nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.bz2 nx-libs-b66699555d2e2503926f01a9c192481e01812399.zip | |
Merge branch 'uli42-pr/various6' into 3.6.x
Attributes GH PR #979: https://github.com/ArcticaProject/nx-libs/pull/979
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Display.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Display.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 15112312f..659355501 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -758,18 +758,17 @@ static void nxagentDisplayFlushHandler(Display *disp, int length) } /* - * From the changelog for nx-X11-3.0.0-4: - * "Added the _NXDisplayErrorPredicate function in XlibInt.c. It is - * actually a pointer to a function called whenever Xlib is going to - * perform a network operation. If the function returns true, the - * call will be aborted and Xlib will return the control to the ap- - * plication. It is up to the application to set the XlibDisplayIO- - * Error flag after the _NXDisplayErrorPredicate returns true. The - * function can be used to activate additional checks, besides the - * normal failures detected by Xlib on the display socket. For exam- - * ple, the application can set the funciton to verify if an inter- - * rupt was received or if any other event occurred mandating the - + end of the session." + * From the changelog for nx-X11-3.0.0-4: "Added the + * _NXDisplayErrorPredicate function in XlibInt.c. It is actually a + * pointer to a function called whenever Xlib is going to perform a + * network operation. If the function returns true, the call will be + * aborted and Xlib will return the control to the application. It is + * up to the application to set the XlibDisplayIO- Error flag after + * the _NXDisplayErrorPredicate returns true. The function can be used + * to activate additional checks, besides the normal failures detected + * by Xlib on the display socket. For example, the application can set + * the function to verify if an interrupt was received or if any other + * event occurred mandating the end of the session." */ static int nxagentDisplayErrorPredicate(Display *disp, int error) { |