This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 4865c05d4d5e05ccecad69fce1843f66f1d45249 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jan 25 16:36:17 2020 +0100 src/sshmasterconnection.cpp: work around lupdate warning by adding another block in the #else preprocessor branch. --- debian/changelog | 2 ++ src/sshmasterconnection.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17ad6de..07b49df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -145,6 +145,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium upon the rendered SVG image, which has been very wrong to do from the beginning and only lead to visual glitches. Correctly repaint single-frame SVG files. + - src/sshmasterconnection.cpp: work around lupdate warning by adding + another block in the #else preprocessor branch. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 2e638e9..f414e07 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -318,6 +318,7 @@ void SshMasterConnection::addReverseTunnelConnections() while (SSH_AGAIN == rc) { rc = ssh_channel_listen_forward(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); #else + { rc = ssh_forward_listen(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); #endif @@ -332,9 +333,7 @@ void SshMasterConnection::addReverseTunnelConnections() x2goDebug<<"Forward port "<<reverseTunnelRequest[i].forwardPort<<" failed:"<<err; emit reverseTunnelFailed(reverseTunnelRequest[i].creator, err); } -#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 0) } -#endif } } reverseTunnelRequestMutex.unlock(); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git