[X2Go-Commits] [x2gokdrive] 04/04: x2gokdriveinit.c: Unifdef KDRIVE_EVDEV.

git-admin at x2go.org git-admin at x2go.org
Fri Jul 12 20:56:02 CEST 2019


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

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 404591f5bd96257050b5af0bf3eaabcb60edcb16
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 12 20:44:12 2019 +0200

    x2gokdriveinit.c: Unifdef KDRIVE_EVDEV.
    
        Backported from X.Org:
    
        commit 1b1a8c481773e15142202a7b761d614b33f12577
        Author: Eric Anholt <eric at anholt.net>
        Date:   Wed Mar 22 15:11:30 2017 -0700
    
            kdrive: Unifdef KDRIVE_EVDEV.
    
            ajax deleted the evdev driver in the removal of fbdev and the linux
            backend.
    
            Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
            Reviewed-by: Daniel Stone <daniels at collabora.com>
            Signed-off-by: Eric Anholt <eric at anholt.net>
    
        Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---
 x2gokdriveinit.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c
index 56edcfd..c449b13 100644
--- a/x2gokdriveinit.c
+++ b/x2gokdriveinit.c
@@ -42,11 +42,6 @@ extern Bool kdHasPointer;
 extern Bool kdHasKbd;
 
 
-#ifdef KDRIVE_EVDEV
-extern KdPointerDriver LinuxEvdevMouseDriver;
-extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
-#endif
-
 void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id);
 void processOutputArg(const char *output, char *parent_id);
 void processScreenArg(const char *screen_size, char *parent_id);
@@ -80,11 +75,6 @@ InitInput(int argc, char **argv)
     KdKeyboardInfo *ki;
     KdPointerInfo *pi;
 
-#ifdef KDRIVE_EVDEV
-    KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
-    KdAddPointerDriver(&LinuxEvdevMouseDriver);
-#endif
-
     if (!SeatId) {
         KdAddKeyboardDriver(&EphyrKeyboardDriver);
         KdAddPointerDriver(&EphyrMouseDriver);

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


More information about the x2go-commits mailing list