[X2Go-Commits] [x2gokdrive] 03/04: x2gokdrive: Adapt to dead slots removal from KdCardFuncs
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 cf630fd2796fc30b262ca8f23d5ece8b83b48d23
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jul 12 20:38:23 2019 +0200
x2gokdrive: Adapt to dead slots removal from KdCardFuncs
This related to this X.Org server commit:
commit b7376fb933ac1b0c1771535c14cf77029eccb7f5
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Mar 24 15:58:55 2017 -0400
kdrive: Remove dead slots from KdCardFuncs
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---
x2gokdrive.c | 27 ---------------------------
x2gokdriveinit.c | 9 ---------
2 files changed, 36 deletions(-)
diff --git a/x2gokdrive.c b/x2gokdrive.c
index d520a4a..96c80c3 100644
--- a/x2gokdrive.c
+++ b/x2gokdrive.c
@@ -977,33 +977,6 @@ ephyrCreateResources(ScreenPtr pScreen)
}
void
-ephyrPreserve(KdCardInfo * card)
-{
-}
-
-Bool
-ephyrEnable(ScreenPtr pScreen)
-{
- return TRUE;
-}
-
-Bool
-ephyrDPMS(ScreenPtr pScreen, int mode)
-{
- return TRUE;
-}
-
-void
-ephyrDisable(ScreenPtr pScreen)
-{
-}
-
-void
-ephyrRestore(KdCardInfo * card)
-{
-}
-
-void
ephyrScreenFini(KdScreenInfo * screen)
{
EphyrScrPriv *scrpriv = screen->driver;
diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c
index a73ffe1..56edcfd 100644
--- a/x2gokdriveinit.c
+++ b/x2gokdriveinit.c
@@ -249,19 +249,10 @@ KdCardFuncs ephyrFuncs = {
ephyrInitScreen, /* initScreen */
ephyrFinishInitScreen, /* finishInitScreen */
ephyrCreateResources, /* createRes */
- ephyrPreserve, /* preserve */
- ephyrEnable, /* enable */
- ephyrDPMS, /* dpms */
- ephyrDisable, /* disable */
- ephyrRestore, /* restore */
ephyrScreenFini, /* scrfini */
ephyrCardFini, /* cardfini */
0, /* initCursor */
- 0, /* enableCursor */
- 0, /* disableCursor */
- 0, /* finiCursor */
- 0, /* recolorCursor */
0, /* initAccel */
0, /* enableAccel */
--
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