[X2Go-Commits] [x2gokdrive] 01/01: fix building on Xorg < 11900000.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit a53195f02c2461ce3bbe23c7124b797f3db32eec
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Wed Feb 1 10:40:31 2023 -0600

    fix building on Xorg <  11900000.
---
 debian/changelog   | 1 +
 x2gokdriveremote.c | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e63c91c..f925782 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     - update the screen with png frames when no data is transmitted.
     - make screen repaint faster.
     - add command line option for initial JPEG quality.
+    - fix building on Xorg <  11900000.
 
   [ Mihai Moldovan ]
   * Initial release:
diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c
index e814150..735cc24 100644
--- a/x2gokdriveremote.c
+++ b/x2gokdriveremote.c
@@ -2967,11 +2967,11 @@ void pollEvents(void)
     if(remoteVars.client_connected)
     {
         client = TRUE;
-        fds[0].fd = remoteVars.clientsock;
+        fds[0].fd = remoteVars.clientsock_tcp;
     }  //we are in connecting state, poll server socket
-    else if(remoteVars.serversock != -1)
+    else if(remoteVars.serversock_tcp != -1)
     {
-        fds[0].fd = remoteVars.serversock;
+        fds[0].fd = remoteVars.serversock_tcp;
     }
     else //not polling any sockets
     {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git