summaryrefslogtreecommitdiff
path: root/os
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 /os
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 'os')
-rw-r--r--os/utils.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/os/utils.c b/os/utils.c
index 8921d7c5f..c2158dc72 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -496,10 +496,6 @@ void UseMsg(void)
ErrorF("-ls int limit stack space to N Kb\n");
#endif
ErrorF("-nolock disable the locking mechanism\n");
-#ifndef NOLOGOHACK
- ErrorF("-logo enable logo in screen saver\n");
- ErrorF("nologo disable logo in screen saver\n");
-#endif
ErrorF("-nolisten string don't listen on protocol\n");
ErrorF("-noreset don't reset after last client exists\n");
ErrorF("-reset reset after last client exists\n");
@@ -755,16 +751,6 @@ ProcessCommandLine(int argc, char *argv[])
#endif
nolock = TRUE;
}
-#ifndef NOLOGOHACK
- else if ( strcmp( argv[i], "-logo") == 0)
- {
- logoScreenSaver = 1;
- }
- else if ( strcmp( argv[i], "nologo") == 0)
- {
- logoScreenSaver = 0;
- }
-#endif
else if ( strcmp( argv[i], "-nolisten") == 0)
{
if(++i < argc) {