This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/typos in repository x2goclient. discards 21f3c45 src/pulsemanager.cpp: fix up a debug string. discards 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. adds b114c54 res/i18n/x2goclient_es.ts: update Spanish translation file. adds ec534c7 res/i18n/x2goclient_es.ts: fixup Spanish translation file where necessary and add comments/requests for re-translations for the next time. adds 44708d6 res/i18n/x2goclient_es.ts: update Spanish translation file. adds 3131bde res/i18n/x2goclient_es.ts: remove obsolete comments and very minor whitespace fixup. adds 6ef548f res/i18n/x2goclient_de.ts: update German translation file. adds b5435f5 res/i18n/x2goclient_de.ts: fixup German translation file, including typo, whitespace, grammar fixes and other stuff. adds a997595 res/i18n/x2goclient_sv.ts: fixup Swedish translation file. adds e9a7aac res/i18n/x2goclient_sv.ts: remove obsolete comments and very minor whitespace fix. adds 812c4b8 macbuild.sh: sanitize find input, as BSD find and GNU find behave differently. adds 368b71d macbuild.sh: get rid of problems and use gfind directly. We need special GNU features. adds 3aa8515 src/appdialog.cpp: logic so that X2Go-Top applications are shown again. adds 84d41d5 res/i18n/x2goclient_fi.ts: update Finnish translation file. adds 5a7a20b res/i18n/x2goclient_fi.ts: fix up Finnish translation file, including typo, whitespace fixes and marking untranslated entries as such again, after removing the English "translation" text. adds add03ee release 4.1.0.0 adds 7f2edea Continue development adds 9612e6a src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh versions. Fixes: #870. adds 15ce4da src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public key via ssh_get_server_publickey () (0.8.0 and higher) or ssh_get_publickey () (0.7.x and lower) and its hash via ssh_get_publickey_hash () instead of using the deprecated ssh_get_pubkey_hash () function. adds c6ce255 src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free (). adds d616e09 src/sshmasterconnection.cpp: replace deprecated channel_new () function with ssh_channel_new (). adds dffc470 src/sshmasterconnection.cpp: replace deprecated channel_open_forward () function with ssh_channel_open_forward (). adds 3b037cd src/sshmasterconnection.cpp: replace deprecated channel_open_session () function with ssh_channel_open_session (). adds b722370 src/sshmasterconnection.cpp: replace deprecated channel_request_exec () function with ssh_channel_request_exec (). adds f1abcbd src/sshmasterconnection.cpp: replace deprecated channel_poll () function with ssh_channel_poll (). adds e67bf45 src/sshmasterconnection.cpp: replace deprecated channel_read () function with ssh_channel_read (). adds f86895a src/sshmasterconnection.cpp: replace deprecated channel_is_eof () function with ssh_channel_is_eof (). adds d14a335 src/sshmasterconnection.cpp: replace deprecated channel_write () function with ssh_channel_write (). adds a71ce02 src/sshmasterconnection.cpp: replace deprecated channel_send_eof () function with ssh_channel_send_eof (). adds efd41a9 src/sshmasterconnection.cpp: replace deprecated channel_close () function with ssh_channel_close (). adds 1d8a37a src/sshmasterconnection.cpp: replace deprecated channel_free () function with ssh_channel_free (). adds ed981d1 src/sshmasterconnection.cpp: use QString::arg () to insert function name and thus deduplicate error translation messages. adds bb727e5 src/sshmasterconnection.cpp: fix up some debug strings. adds a5b4d79 src/sshmasterconnection.cpp: port more occurrences of "QString to C string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd. adds a5639de src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121. new 8e503d8 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 e7e2e4e src/pulsemanager.cpp: fix up a debug string. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (21f3c45) \ N -- N -- N refs/heads/bugfix/typos (e7e2e4e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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: VERSION | 2 +- debian/changelog | 110 ++++++++- macbuild.sh | 11 +- man/man1/x2goclient.1 | 2 +- res/i18n/x2goclient_de.ts | 221 ++++++++++------- res/i18n/x2goclient_es.ts | 228 +++++++++-------- res/i18n/x2goclient_fi.ts | 204 +++++++++------- res/i18n/x2goclient_sv.ts | 19 +- src/appdialog.cpp | 24 +- src/sessionwidget.cpp | 19 +- src/sshmasterconnection.cpp | 324 +++++++++++++++++++------ src/version.h | 2 +- x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 10 +- x2goclient.spec | 2 +- 14 files changed, 775 insertions(+), 403 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 8e503d89ee2d03a313c3deff11f0516fce503022 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 10d1d47..c82874f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,9 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium - src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121. Shorthands as host names and other bells and whistles like inferred port or user name values are now supported. + - 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. -- X2Go Release Manager <git-admin@x2go.org> Wed, 22 Feb 2017 07:13:10 +0100 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 e7e2e4e0821ccf61a0a9711ae35147b4db0b1cf4 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 c82874f..0e8cf77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,9 @@ x2goclient (4.1.0.1-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. -- X2Go Release Manager <git-admin@x2go.org> Wed, 22 Feb 2017 07:13:10 +0100 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