This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit e835a4850de4fa2f6b399efd21e064d7d3e132ba Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 20 15:19:39 2020 +0100 x2gokdrive{,remote}.c: fix logic flaws. --- debian/changelog | 1 + x2gokdrive.c | 4 ++-- x2gokdriveremote.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0fc1e6..5ed189e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium 1.20.5. - patches.xorg/: add 1.20.7 files, essentially copied and refreshed from 1.20.6. + - x2gokdrive{,remote}.c: fix logic flaws. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/x2gokdrive.c b/x2gokdrive.c index 3789fee..8673a6e 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -1082,13 +1082,13 @@ ScreenPtr ephyrCursorScreen; /* screen containing the cursor */ static void ephyrWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { -#if XORG_VERSION_CURRENT < 11900000 +#if XORG_VERSION_CURRENT >= 11900000 input_lock(); #endif /* XORG_VERSION_CURRENT */ ephyrCursorScreen = pScreen; miPointerWarpCursor(inputInfo.pointer, pScreen, x, y); -#if XORG_VERSION_CURRENT < 11900000 +#if XORG_VERSION_CURRENT >= 11900000 input_unlock(); #endif /* XORG_VERSION_CURRENT */ } diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index 17aaa61..ac524f0 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -1436,7 +1436,7 @@ void *send_frame_thread (void *threadid) //only accept one client, close server socket shutdown(remoteVars.serversock, SHUT_RDWR); close(remoteVars.serversock); -#if XORG_VERSION_CURRENT < 11900000 +#if XORG_VERSION_CURRENT >= 11900000 SetNotifyFd(remoteVars.clientsock, clientReadNotify, X_NOTIFY_READ, NULL); #endif /* XORG_VERSION_CURRENT */ remoteVars.client_connected=TRUE; @@ -1459,7 +1459,7 @@ void *send_frame_thread (void *threadid) if(!remoteVars.client_connected) { EPHYR_DBG ("TCP connection closed\n"); -#if XORG_VERSION_CURRENT < 11900000 +#if XORG_VERSION_CURRENT >= 11900000 RemoveNotifyFd(remoteVars.clientsock); #endif /* XORG_VERSION_CURRENT */ shutdown(remoteVars.clientsock, SHUT_RDWR); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git