From ff4e2c24ec599ecdbd24eb181afb50f896beb46d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 16 Oct 2019 14:43:36 -0400 Subject: [PATCH] dix: Move default screensaver defaults into globals.c --- dix/globals.c | 9 +++++---- include/site.h | 4 ---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dix/globals.c b/dix/globals.c index 7f5dc7c51..c0779dddc 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -93,10 +93,11 @@ CARD32 ScreenSaverInterval; int ScreenSaverBlanking; int ScreenSaverAllowExposures; -CARD32 defaultScreenSaverTime = DEFAULT_SCREEN_SAVER_TIME; -CARD32 defaultScreenSaverInterval = DEFAULT_SCREEN_SAVER_INTERVAL; -int defaultScreenSaverBlanking = DEFAULT_SCREEN_SAVER_BLANKING; -int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES; +/* default time of 10 minutes */ +CARD32 defaultScreenSaverTime = (10 * (60 * 1000)); +CARD32 defaultScreenSaverInterval = (10 * (60 * 1000)); +int defaultScreenSaverBlanking = PreferBlanking; +int defaultScreenSaverAllowExposures = AllowExposures; #ifdef SCREENSAVER Bool screenSaverSuspended = FALSE; diff --git a/include/site.h b/include/site.h index c9dc2d202..02e33418a 100644 --- a/include/site.h +++ b/include/site.h @@ -51,9 +51,5 @@ SOFTWARE. * The following constants contain default values for all of the variables * that can be initialized on the server command line or in the environment. */ -#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000)) -#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000)) -#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking -#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures #endif /* SITE_H */