diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-03-17 20:39:28 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-17 20:39:28 +0100 |
commit | 7fd5d934c1e73642e9919aa8dd5124466356fb89 (patch) | |
tree | 1942909531fe17bb60bd1e4601d7455b19b5c177 /nx-X11/programs/Xserver/hw/nxagent/Init.c | |
parent | 6ac805ab4411d3045c99e3ceefe8495ac95d8e15 (diff) | |
parent | f315ae066598d0dc955db081f8d0faf8d358292d (diff) | |
download | nx-libs-7fd5d934c1e73642e9919aa8dd5124466356fb89.tar.gz nx-libs-7fd5d934c1e73642e9919aa8dd5124466356fb89.tar.bz2 nx-libs-7fd5d934c1e73642e9919aa8dd5124466356fb89.zip |
Merge branch 'sunweaver-pr/setnotifyfd-ABI' into 3.6.x
Attributes GH PR #331: https://github.com/ArcticaProject/nx-libs/pull/331
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Init.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 218766e06..f15f2cb0a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -58,6 +58,7 @@ is" without express or implied warranty. #include "Pointer.h" #include "Keyboard.h" #include "Handlers.h" +#include "Events.h" #include "Init.h" #include "Args.h" #include "Client.h" @@ -407,6 +408,12 @@ FIXME: These variables, if not removed at all because have probably blackRoot = TRUE; } +void +nxagentNotifyConnection(int fd, int ready, void *data) +{ + nxagentDispatchEvents(NULL); +} + void InitInput(argc, argv) int argc; char *argv[]; |