This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 31beb51df199d1fec9cec2afe2c7c3684728bc2a Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Feb 28 21:48:28 2021 +0100 nxcomp/Children.cpp: also try searching nxdialog, not only nxclient --- nxcomp/src/Children.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp index 842db7fe5..abfcbf2f9 100644 --- a/nxcomp/src/Children.cpp +++ b/nxcomp/src/Children.cpp @@ -225,6 +225,7 @@ int NXTransDialog(const char *caption, const char *message, << "\\-----------------------------------------------------------\n"; } + for (int i = 0; i < 4; i++) { if (local != 0) { @@ -274,11 +275,17 @@ int NXTransDialog(const char *caption, const char *message, // in the default NX path. // - if (i == 0) + if (i == 0 || i == 2) { - strcpy(command, "nxclient"); + } + else if (i == 1 || i == 3) + { + strcpy(command, "nxdialog"); + } + if (i == 2) + { char newPath[DEFAULT_STRING_LIMIT]; strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:"); @@ -332,7 +339,18 @@ int NXTransDialog(const char *caption, const char *message, setenv("PATH", newPath, 1); #endif + } + else + { + #ifdef TEST + *logofs << "NXTransDialog: WARNING! Trying with command '" + << command << "'.\n" << logofs_flush; + #endif + #ifdef WARNING + cerr << "Warning" << ": Trying with command '" << command + << "'.\n"; + #endif } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git