From bfc05af73df842ed48ee46ae6e4df516335024fe Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 17 Feb 2019 18:00:28 +0100 Subject: nxproxy: list known session types in help output The old unix-* session types are deprecated and will always lead to a warning message "Unrecognized session type". Internally there are only three session types: agent, proxy and shadow, all the others are mapped to one of those three. --- nxcomp/src/Misc.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp index 4f1af0ec4..519489268 100644 --- a/nxcomp/src/Misc.cpp +++ b/nxcomp/src/Misc.cpp @@ -163,8 +163,11 @@ static const char UsageInfo[] = 'wan', 'lan', 'local' or a bandwidth specification,\n\ like for example '56k', '1m', '100m', etc.\n\ \n\ - type=s Type of session, for example 'windows', 'unix-kde'.\n\ - 'unix-application', etc.\n\ + type=s Type of session. Known types are: 'agent', 'proxy' and\n\ + 'shadow'. The following types are also allowed and will\n\ + map to one of the three mentioned before: 'desktop',\n\ \ + 'rootless', 'console', 'default', 'gnome', 'kde',\n\ + 'cde', 'xdm', 'win', 'vnc', 'application', 'raw'\n\ \n\ display=s Specify the real display where X connections have\n\ to be forwarded by the proxy running on the client.\n\ -- cgit v1.2.3 From fc29077594fa20fb5243cfa8b5daf073d357b020 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 18 Feb 2019 08:45:11 +0100 Subject: Keyboard.c: fix comment. --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index af27c6e28..05adab494 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -870,8 +870,7 @@ XkbError: * when cloning we do not want X2Go to set the keyboard * via a keyboard file generated by nxagent. The defined * method for switching that off is the creation of a dir - * instead of a file. Which is achieved by passing NULL to - * nxagentWriteKeyboardFile. + * instead of a file. */ if (nxagentX2go == 1) nxagentWriteKeyboardDir(); -- cgit v1.2.3