[X2Go-Commits] [x2goclient] 11/18: src/sshmasterconnection.cpp: replace deprecated channel_write () function with ssh_channel_write ().

git-admin at x2go.org git-admin at x2go.org
Wed Feb 22 09:10:05 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 d14a335f6d645a2b9fc004a858f7166770f21252
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 1423d8f..1027f28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,9 @@ x2goclient (4.1.0.1-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.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Wed, 22 Feb 2017 07:13:10 +0100
 
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 90a9f7a..c8379f0 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