diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 12:38:44 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 12:38:44 +0200 |
| commit | f2dc8121d903ddefba96483874dca69aac47fb59 (patch) | |
| tree | 995c21b3fe7334999b99efa9b52c1c0b7ebce8d6 /nx-X11/programs/Xserver/dix | |
| parent | 82fc54e577c56ee3952f14c4a5c9f50c16645591 (diff) | |
| parent | fde52a9b773f85c59a3f6473f2fef08fde91016a (diff) | |
| download | nx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.tar.gz nx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.tar.bz2 nx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.zip | |
Merge branch 'uli42-pr/refactor_timeout' into 3.6.x
Attributes GH PR #899: https://github.com/ArcticaProject/nx-libs/pull/899
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dispatch.c | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/window.c | 2 |
2 files changed, 0 insertions, 7 deletions
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) |