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 2ba4653557be21c78a8005a3f8ec64254778d78b
Author: Mihai Moldovan <io...@ionic.de>
Date: Sat Jan 28 18:06:22 2017 +0100
src/sshmasterconnection.cpp: replace deprecated channel_read () function
with ssh_channel_read ().
Might break on ancient systems, but we don't care.
---
debian/changelog | 3 +++
src/sshmasterconnection.cpp | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 65d63b3..182f22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -588,6 +588,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
- src/sshmasterconnection.cpp: replace deprecated channel_poll () function
with ssh_channel_poll (). Might break on ancient systems, but we don't
care.
+ - src/sshmasterconnection.cpp: replace deprecated channel_read () function
+ with ssh_channel_read (). 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 990fb93..dd2df0e 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1662,7 +1662,7 @@ void SshMasterConnection::channelLoop()
#ifdef DEBUG
// x2goDebug<<"read err data from channel\n";
#endif
- nbytes = channel_read ( channel, buffer, sizeof ( buffer )-1,
1 );
+ nbytes = ssh_channel_read ( channel, buffer, sizeof ( buffer
)-1, 1 );
emit stdErr ( channelConnections[i].creator, QByteArray (
buffer,nbytes ) );
#ifdef DEBUG
// x2goDebug<<nbytes<<" err from channel"<<endl;
@@ -1683,7 +1683,7 @@ void SshMasterConnection::channelLoop()
#ifdef DEBUG
// x2goDebug<<"read data from channel
"<<channel<<endl;
#endif
- nbytes = channel_read ( channel, buffer, sizeof ( buffer )-1,
0 );
+ nbytes = ssh_channel_read ( channel, buffer, sizeof ( buffer
)-1, 0 );
#ifdef DEBUG
// x2goDebug<<nbytes<<" from channel
"<<channel<<endl;
#endif
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
