[X2Go-Commits] [x2goclient] 08/15: src/sshmasterconnection.cpp: replace deprecated channel_poll () function with ssh_channel_poll ().

[git-admin at x2go.org]

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 a07327f25f355db8cf307f5785450427dca87012
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jan 28 17:54:41 2017 +0100

    src/sshmasterconnection.cpp: replace deprecated channel_poll () function with ssh_channel_poll ().
    
    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 e9770e1..89a2f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -581,6 +581,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
     - src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
       function with ssh_channel_request_exec (). Might break on ancient
       systems, but we don't care.
+    - src/sshmasterconnection.cpp: replace deprecated channel_poll () function
+      with ssh_channel_poll (). 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 1ea8de6..d1b2206 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1651,7 +1651,7 @@ void SshMasterConnection::channelLoop()
             ssh_channel channel=channelConnections.at ( i ).channel;
             if ( channel==0l )
                 continue;
-            if ( channel_poll ( channel,1 ) >0 )
+            if ( ssh_channel_poll ( channel,1 ) > 0 )
             {
 #ifdef DEBUG
                 //              x2goDebug<<"read err data from channel\n";
@@ -1662,7 +1662,7 @@ void SshMasterConnection::channelLoop()
                 //              x2goDebug<<nbytes<<" err from channel"<<endl;
 #endif
             }
-            int rez=channel_poll ( channel,0 );
+            int rez = ssh_channel_poll ( channel, 0 );
             if ( rez==SSH_EOF )
             {
 #ifdef DEBUG

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git