This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient.
commit 3894c5f0800dc5167414c58a1e4813d23ecec401 Author: Mihai Moldovan <io...@ionic.de> Date: Sat May 12 02:45:48 2018 +0200 src/onmainwindow.cpp: fix other compile errors/typos. --- debian/changelog | 1 + src/onmainwindow.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 578c4c8..6591681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium option value. - src/onmainwindow.cpp: handle a disabled X.Org Server start limit correctly. + - src/onmainwindow.cpp: fix other compile errors/typos. * x2goclient.spec: - Remove plugin references. * debian/rules: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 2b50576..20b396b 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -7678,7 +7678,7 @@ bool ONMainWindow::parseParameter ( QString param ) x2goDebug << "Not limiting X.Org Server starts."; x_start_limit_ = 0; - { + } else { if (SIZE_MAX < conv) { conv = SIZE_MAX; @@ -7688,7 +7688,7 @@ bool ONMainWindow::parseParameter ( QString param ) x_start_limit_ = conv; - x2goDebug << "Limiting X.Org Server starts to " << x_start_limit << " tries."; + x2goDebug << "Limiting X.Org Server starts to " << x_start_limit_ << " tries."; } } else { @@ -10152,7 +10152,7 @@ void ONMainWindow::slotCheckXOrgConnection() * should kill it. */ x2goDebug << "Timeout reached waiting for the X.Org Server to open a listening TCP socket." << endl - << "Restarting on higher DISPLAY port. Try count: " << x_start_Tries; + << "Restarting on higher DISPLAY port. Try count: " << x_start_tries; xorg->terminate (); delete xorg; @@ -10161,7 +10161,7 @@ void ONMainWindow::slotCheckXOrgConnection() startXOrg (1); return; - { + } else { QMessageBox::critical (NULL, QString::null, tr ("Can't start X.Org Server.\n" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git _______________________________________________ x2go-commits mailing list x2go-commits@lists.x2go.org https://lists.x2go.org/listinfo/x2go-commits