This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 12717a38e08307009f7e2ccdbff0bb1f72b47d12 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 13 06:03:09 2016 +0100 onmainwindow.cpp: be more precise in slotScDaemonError () regarding unknown and undefined errors. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8ee5fbc..5c5bef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low to qmake. Due to the qt4-mac's changes, we do not automatically get these values automatically "appended" in a usable way anymore. - x2gosettings.cpp: let centralSettings () return false on Windows. + - onmainwindow.cpp: be more precise in slotScDaemonError () regarding + unknown and undefined errors. [ Oleksandr Shneyder ] * New upstream release (4.0.5.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 792e0af..c574070 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -8567,9 +8567,12 @@ void ONMainWindow::slotScDaemonError (QProcess::ProcessError error) { break; } case QProcess::UnknownError: { + main_text += tr ("encountered an unknown error during start up or execution."); + break; } default: { - main_text += tr ("experienced an unknown error."); + main_text += tr ("experienced an undefined error."); + break; } } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git