summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTiago Vignatti <tiago.vignatti@nokia.com>2010-10-20 17:54:58 -0200
committerTiago Vignatti <tiago.vignatti@nokia.com>2010-11-11 23:20:35 +0200
commitbfe9cdd11bcb60cf33dc48136ebee028001a737e (patch)
tree185c93be767da84d1413e84181cc9594802e61fc /include
parent88cb61e1e55c54982b90e2a77465faaac6a0ba89 (diff)
dix: delete logo hack screen saver
Protocol doesn't mention about screen saver with logo being required and people are already using more intelligent ways to draw screen saver themes. So consider -logo as deprecated option, deleting its code. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'include')
-rw-r--r--include/opaque.h3
-rw-r--r--include/site.h3
2 files changed, 0 insertions, 6 deletions
diff --git a/include/opaque.h b/include/opaque.h
index dfe440cdc..abaee453f 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -56,9 +56,6 @@ extern _X_EXPORT Bool disableBackingStore;
extern _X_EXPORT Bool enableBackingStore;
extern _X_EXPORT Bool PartialNetwork;
extern _X_EXPORT Bool RunFromSigStopParent;
-#ifndef NOLOGOHACK
-extern _X_EXPORT int logoScreenSaver;
-#endif
#ifdef RLIMIT_DATA
extern _X_EXPORT int limitDataSpace;
#endif
diff --git a/include/site.h b/include/site.h
index b13421231..9c2836f21 100644
--- a/include/site.h
+++ b/include/site.h
@@ -112,9 +112,6 @@ SOFTWARE.
#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
-#ifndef NOLOGOHACK
-#define DEFAULT_LOGO_SCREEN_SAVER 1
-#endif
#ifndef DEFAULT_ACCESS_CONTROL
#define DEFAULT_ACCESS_CONTROL TRUE
#endif