From ae94215d06b2c66f782900499a6151455aa45e2a Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 16 Jan 2020 22:58:29 +0100
Subject: nxagent: remove now-obsolete own copies of ScreenSaver procs

we moved the auto-disconnect feature to an own timer so there's no
need for a special treatment in screen saver stuff anymore.
---
 nx-X11/programs/Xserver/dix/dispatch.c | 5 -----
 nx-X11/programs/Xserver/dix/window.c   | 2 --
 2 files changed, 7 deletions(-)

(limited to 'nx-X11/programs/Xserver/dix')

diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
index 6c18c5b59..6d0d61a15 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -3167,8 +3167,6 @@ ProcQueryBestSize (register ClientPtr client)
     return (client->noClientException);
 }
 
-
-#ifndef NXAGENT_SERVER
 int
 ProcSetScreenSaver (register ClientPtr client)
 {
@@ -3224,7 +3222,6 @@ ProcSetScreenSaver (register ClientPtr client)
     SetScreenSaverTimer();
     return (client->noClientException);
 }
-#endif /* NXAGENT_SERVER */
 
 int
 ProcGetScreenSaver(register ClientPtr client)
@@ -3425,7 +3422,6 @@ ProcChangeCloseDownMode(register ClientPtr client)
     }
 }
 
-#ifndef NXAGENT_SERVER
 int ProcForceScreenSaver(register ClientPtr client)
 {    
     REQUEST(xForceScreenSaverReq);
@@ -3441,7 +3437,6 @@ int ProcForceScreenSaver(register ClientPtr client)
     SaveScreens(SCREEN_SAVER_FORCER, (int)stuff->mode);
     return client->noClientException;
 }
-#endif /* NXAGENT_SERVER */
 
 int ProcNoOperation(register ClientPtr client)
 {
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c
index d294e139d..9358a96c4 100644
--- a/nx-X11/programs/Xserver/dix/window.c
+++ b/nx-X11/programs/Xserver/dix/window.c
@@ -3334,7 +3334,6 @@ static void DrawLogo(
 );
 #endif
 
-#ifndef NXAGENT_SERVER
 void
 SaveScreens(int on, int mode)
 {
@@ -3445,7 +3444,6 @@ SaveScreens(int on, int mode)
     if (mode == ScreenSaverReset)
        SetScreenSaverTimer();
 }
-#endif /* NXAGENT_SERVER */
 
 static Bool
 TileScreenSaver(int i, int kind)
-- 
cgit v1.2.3