[X2Go-Commits] [x2goclient] 10/14: src/sshmasterconnection.cpp: replace deprecated channel_write () function with ssh_channel_write ().
git-admin at x2go.org
git-admin at x2go.org
Thu Feb 2 06:55:30 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.
commit 1920cfd78bc209efd492fbebeec92623d4544c0b
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Jan 28 18:10:26 2017 +0100
src/sshmasterconnection.cpp: replace deprecated channel_write () function with ssh_channel_write ().
Might break on ancient systems, but we don't care.
---
debian/changelog | 3 +++
src/sshmasterconnection.cpp | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 354947e..28e2c4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -591,6 +591,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
- src/sshmasterconnection.cpp: replace deprecated channel_is_eof ()
function with ssh_channel_is_eof (). Might break on ancient systems, but
we don't care.
+ - src/sshmasterconnection.cpp: replace deprecated channel_write ()
+ function with ssh_channel_write (). Might break on ancient systems, but
+ we don't care.
[ Bernard Cafarelli ]
* New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 2857e11..91739b8 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1746,13 +1746,13 @@ void SshMasterConnection::channelLoop()
#endif
if ( nbytes > 0 )
{
- if ( channel_write ( channel, buffer, nbytes ) !=nbytes )
+ if ( ssh_channel_write ( channel, buffer, nbytes ) !=nbytes )
{
QString err=ssh_get_error ( my_ssh_session );
- QString errorMsg=tr ( "channel_write failed." );
- emit ioErr ( channelConnections[i].creator, errorMsg, err );
+ QString errorMsg=tr ( "ssh_channel_write failed" );
+ emit ioErr ( channelConnections[i].creator, errorMsg + ".", err );
#ifdef DEBUG
- x2goDebug<<errorMsg<<" - "<<err<<endl;
+ x2goDebug<<errorMsg<<": "<<err<<endl;
#endif
finalize ( i );
continue;
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list