This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/osx in repository x2goclient. from 5ff18d9 {x2goclient.pro,res/osxbundle/{Info.plist,postbuild.sh}}: new e232e50 onmainwindow.cpp: consolidate Windows and non-Windows sshd startup error message. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ src/onmainwindow.cpp | 45 ++++++++++++++++++++------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit e232e504d10fe3d6abf9d074a6dfbf61f56b4f4f Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 11 23:57:08 2015 +0100 onmainwindow.cpp: consolidate Windows and non-Windows sshd startup error message. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 45 ++++++++++++++++++++------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 04667b5..63ec0dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -198,6 +198,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low + Use this script in x2goclient.pro as QMAKE_POST_LINK command. + Move Icon copying into that script. + Define version in x2goclient.pro. + - onmainwindow.cpp: consolidate Windows and non-Windows sshd startup error + message. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index fad2cb7..6e99e7e 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -11358,38 +11358,33 @@ void ONMainWindow::initSelectSessDlg() void ONMainWindow::printSshDError_startupFailure() { -#ifdef Q_OS_WIN if ( closeEventSent ) return; - QMessageBox::critical ( 0l,tr ( "SSH Error" ), - tr ( "SSH daemon could not be started.\n\n" - - "You'll need SSH daemon for printing and file sharing.\n\n" - - "Normally, this should not happen as X2Go Client for \n" - "Windows ships its internal sshd.exe.\n\n" - - "If you see this message, please report a bug against\n" - "the X2Go bugtracker." - ), - QMessageBox::Ok,QMessageBox::NoButton ); + QString error_message = tr ("" +#ifdef Q_OS_WIN + "SSH daemon could not be started.\n\n" #else - if ( closeEventSent ) - return; - Non_Modal_MessageBox::critical (0l, tr ("SSH Error"), - tr ("SSH daemon is not running.\n\n" - - "You have enabled Remote Printing or File Sharing.\n" - "These features require a running and functioning SSH server on your computer.\n\n" + "SSH daemon is not running.\n\n" +#endif + "You have enabled Remote Printing or File Sharing.\n" + "These features require a running and functioning SSH server on your computer.\n\n" +#ifdef Q_OS_WIN + "Normally, this should not happen as X2Go Client for\n" + "Windows ships its internal SSH server.\n\n" - "The Server is currently not started.\n\n" + "If you see this message, please report a bug at\n" + "the X2Go bugtracker." +#else + "The Server is currently not started.\n\n" - "Please ask your system administrator to provide the SSH\n" - "service on your computer.\n\n" + "Please ask your system administrator to provide the SSH\n" + "service on your computer.\n\n" +#endif + "Disabling Remote Printing or File Sharing support will get rid of this message."); - "Disabling Remote Printing or File Sharing support will get rid of this message."), + Non_Modal_MessageBox::critical (0l, tr ("SSH Error"), + error_message, QMessageBox::Ok, QMessageBox::NoButton); -#endif } void ONMainWindow::printSshDError_noHostPubKey() -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org