This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/typos in repository x2goclient. from 40be528 src/onmainwindow.cpp: correctly guard the new lines from the previous commit. new 771efe8 src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message displayed when the server-specified key is unknown, but we have another key type stored already. new 21f3c45 src/pulsemanager.cpp: fix up a debug string. The 2 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 | 6 ++++++ src/httpbrokerclient.cpp | 2 +- src/onmainwindow.cpp | 2 +- src/pulsemanager.cpp | 2 +- 4 files changed, 9 insertions(+), 3 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/typos in repository x2goclient. commit 771efe85d99c726c42143f0b2077f0beec3aff60 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 2 18:00:28 2017 +0100 src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message displayed when the server-specified key is unknown, but we have another key type stored already. --- debian/changelog | 3 +++ src/httpbrokerclient.cpp | 2 +- src/onmainwindow.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fad063a..98c4d4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -557,6 +557,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium time (for instance when running x2goclient --help.) - src/onmainwindow.cpp: correctly guard the new lines from the previous commit. Fixes compile issues on Linux and other systems. + - src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message + displayed when the server-specified key is unknown, but we have another + key type stored already. [ Bernard Cafarelli ] * New upstream version (4.1.0.0): diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index 1af824e..7ea6ccf 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -141,7 +141,7 @@ void HttpBrokerClient::slotSshServerAuthError(int error, QString sshMessage, Ssh return; case SSH_SERVER_FOUND_OTHER: - errMsg=tr ( "The host key for this server was not found but another" + errMsg=tr ( "The host key for this server was not found but another " "type of key exists. An attacker might have changed the default server key to " "trick your client into thinking the key does not exist yet." ); connection->writeKnownHosts(false); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 604d25d..e1ae22c 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3093,7 +3093,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa } break; case SSH_SERVER_FOUND_OTHER: - errMsg=tr ( "The host key for this server was not found but another" + errMsg=tr ( "The host key for this server was not found but another " "type of key exists. An attacker might have changed the default server key to " "trick your client into thinking the key does not exist yet.\n" "For security reasons, it is recommended to stop the connection attempt.\n" -- 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/typos in repository x2goclient. commit 21f3c4516f82adfdddd276357cb241c5dbf5fa4f Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 3 02:00:59 2017 +0100 src/pulsemanager.cpp: fix up a debug string. Qt drops a space where I'd like to have one and inserts a space where I'd like none, so work around that fancifully. --- debian/changelog | 3 +++ src/pulsemanager.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98c4d4d..cc9bcda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -560,6 +560,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium - src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message displayed when the server-specified key is unknown, but we have another key type stored already. + - src/pulsemanager.cpp: fix up a debug string. Qt drops a space where I'd + like to have one and inserts a space where I'd like none, so work around + that fancifully. [ Bernard Cafarelli ] * New upstream version (4.1.0.0): diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp index 30c2262..c050e01 100644 --- a/src/pulsemanager.cpp +++ b/src/pulsemanager.cpp @@ -229,7 +229,7 @@ void PulseManager::start_generic () { * Otherwise, we'd better use signals and slots to not block the main thread. */ if (pulse_server_->waitForStarted (-1)) { - x2goDebug << "pulse started with arguments" << server_args_ << "; waiting for finish..."; + x2goDebug << "pulse started with arguments " << server_args_ << "- waiting for it to finish..."; state_ = QProcess::Running; connect (pulse_server_, SIGNAL (finished (int)), -- 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