This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 47958468131c6497f30104c84c7a28462b9a82d8 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jun 3 02:37:51 2015 +0200 onmainwindow.cpp: add more newlines to scdaemon error output. Use trayQuit() method to really quit the client. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b14e9da..9546e13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low overwriting it. - x2goutils.cpp: correct typo to fix compile errors. - onmainwindow.cpp: drop a redundant variable and fix empty env check. + - onmainwindow.cpp: add more newlines to scdaemon error output. Use + trayQuit() method to really quit the client. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 May 2015 21:42:09 +0200 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 3968ece..0202a12 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -8475,14 +8475,14 @@ void ONMainWindow::slotScDaemonError (QProcess::ProcessError error) { } if (!informative_text.isEmpty ()) { - informative_text += "\n"; + informative_text += "\n\n"; } - informative_text += tr ("X2Go Client will now terminate.\n" + informative_text += tr ("X2Go Client will now terminate.\n\n" "File a bug report as outlined on the <a href=\"http://wiki.x2go.org/doku.php/wiki:bugs\">bugs wiki page</a>."); show_RichText_ErrorMsgBox (main_text, informative_text); - closeClient (); + trayQuit (); } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git