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.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user