This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 1175599f05b1a4d6edc25fe0036a66a36bc2043d Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 7 08:54:18 2019 +0200 {x2goclient,help,onmainwindow}.cpp: implement new --bypass-cleanup-helper parameter. --- debian/changelog | 2 ++ src/help.cpp | 3 +++ src/onmainwindow.cpp | 6 ++++++ src/x2goclient.cpp | 1 + 4 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index c3df242..e894c2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -89,6 +89,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium doesn't recognize that, so add another linux-* catch. - Windows: add support for x3270-fonts, including adding a pretty nasty but necessary fonts.* file regeneration hook. + - {x2goclient,help,onmainwindow}.cpp: implement new + --bypass-cleanup-helper parameter. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/help.cpp b/src/help.cpp index 8956b17..9331c6d 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -173,6 +173,9 @@ help::params_t help::build_params () { "If <num> is zero or a negative number, no limit is imposed." NEWLINE "The limits for <num> are platform dependent. If the passed value is out of bounds, X2Go Client falls back to the default value.")); #endif /* defined (Q_OS_WIN) */ +#if defined (Q_OS_UNIX) + ADD_OPT ("--bypass-cleanup-helper", QT_TRANSLATE_NOOP ("Help", "Disables X2Go Client's UNIX cleanup helper. This will prevent X2Go Client from terminating spawned processes after the main program terminates or crashes. Use with care and when in doubt, do not use this parameter at all.")); +#endif /* defined (Q_OS_UNIX) */ # undef NEWLINE # undef ADD_OPT diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index ec7cb77..7c7c1ba 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -7335,6 +7335,12 @@ void ONMainWindow::slotReadApplications(bool result, QString output, bool ONMainWindow::parseParameter ( QString param ) { +#if defined (Q_OS_UNIX) + if ("--bypass-cleanup-helper" == param) { + return (true); + } +#endif /* defined (Q_OS_UNIX) */ + if ( param=="--help" ) { showHelp(); diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp index bd5fc82..73f4291 100644 --- a/src/x2goclient.cpp +++ b/src/x2goclient.cpp @@ -107,6 +107,7 @@ int main (int argc, char **argv) { * refactored into a special options parser class. */ const std::string bypass_flags[] = { + "--bypass-cleanup-helper", "--help", "--help-pack", "--version", -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git