diff options
| author | Fredrik Höglund <fredrik@kde.org> | 2006-03-24 20:50:13 +0000 |
|---|---|---|
| committer | Fredrik Höglund <fredrik@kde.org> | 2006-03-24 20:50:13 +0000 |
| commit | ae935832facfa81a9689882406ecca74b0346790 (patch) | |
| tree | 1a0ebe7f71e7fe26be2ff383386b1d0ed01539f5 /dix | |
| parent | d1746ec0f0c8a0b750f390e7a7faf21b67683f4a (diff) | |
Refactored the screensaver and DPMS timer code to use the screensaver timer
for both screensaver and DPMS. Removed the SetDPMSTimers() and
FreeDPMSTimers() functions.
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/dix/main.c b/dix/main.c index 39c060f31..9d66a4fa8 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xserver/xorg/dix/main.c,v 1.14 2005/07/03 08:53:38 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/dix/main.c,v 1.15 2006/02/15 20:44:12 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** @@ -432,9 +432,6 @@ main(int argc, char *argv[], char *envp[]) InitRootWindow(WindowTable[i]); DefineInitialRootWindow(WindowTable[0]); SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset); -#ifdef DPMSExtension - SetDPMSTimers(); -#endif #ifdef PANORAMIX if (!noPanoramiXExtension) { @@ -481,9 +478,6 @@ main(int argc, char *argv[], char *envp[]) WindowTable = NULL; FreeFonts(); -#ifdef DPMSExtension - FreeDPMSTimers(); -#endif FreeAuditTimer(); xfree(serverClient->devPrivates); |