diff options
| author | Fredrik Höglund <fredrik@kde.org> | 2006-04-05 21:23:06 +0000 |
|---|---|---|
| committer | Fredrik Höglund <fredrik@kde.org> | 2006-04-05 21:23:06 +0000 |
| commit | 916b7b95be502a4bd514353f274a5061c0d913d3 (patch) | |
| tree | 87180a1b464c57966ab4e13a8121c0187abe4b1c /dix | |
| parent | 49bd7d71329f2ec9e37668d3c93f064fbfbed665 (diff) | |
Put the screensaver extension back in the Xext module.
Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/globals.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dix/globals.c b/dix/globals.c index f8b4e3ead..d686baffa 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xserver/xorg/dix/globals.c,v 1.7 2005/07/03 08:53:38 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/dix/globals.c,v 1.8 2006/02/15 20:44:12 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ /************************************************************ @@ -132,6 +132,10 @@ int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES; int logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER; #endif +#ifdef SCREENSAVER +Bool screenSaverSuspended = FALSE; +#endif + char *defaultFontPath = COMPILEDDEFAULTFONTPATH; char *defaultTextFont = COMPILEDDEFAULTFONT; char *defaultCursorFont = COMPILEDCURSORFONT; |