[PATCH 04/15] xfree86: xquartz: remove superfluous -showconfig option

[Tiago Vignatti]

It's there since the first cvs revision there "for compatibility reasons".
Therefore time to deprecate it now.

-version does the same job.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 hw/xfree86/common/xf86Init.c    |    2 +-
 hw/xfree86/doc/man/Xorg.man.pre |    8 --------
 hw/xquartz/darwin.c             |    2 +-
 hw/xquartz/quartzStartup.c      |    2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 1ea8322..533bbd7 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1161,7 +1161,7 @@ ddxProcessArgument(int argc, char **argv, int i)
     xf86SetVerbosity(-1);
     return 1;
   }
-  if (!strcmp(argv[i],"-showconfig") || !strcmp(argv[i],"-version"))
+  if (!strcmp(argv[i],"-version"))
   {
     xf86PrintBanner();
     exit(0);
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index 805f3a3..a8ff67f 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -389,14 +389,6 @@ section when there are no
 .B Layout
 sections.
 .TP 8
-.B \-showconfig
-This is the same as the
-.B \-version
-option, and is included for compatibility reasons.  It may be removed
-in a future release, so the
-.B \-version
-option should be used instead.
-.TP 8
 .B \-showDefaultModulePath
 Print out the default module path the server was compiled with.
 .TP 8
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index a99c0f1..dbf7bb4 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -723,7 +723,7 @@ int ddxProcessArgument( int argc, char *argv[], int i )
         return 2;
     }
 
-    if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
+    if (!strcmp( argv[i], "-version" )) {
         DarwinPrintBanner();
         exit(0);
     }
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index ba92ece..27638aa 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -111,7 +111,7 @@ int server_main(int argc, char **argv, char **envp) {
 
     for (i = 1; i < argc; i++) {
         // Display version info without starting Mac OS X UI if requested
-        if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
+        if (!strcmp(argv[i], "-version")) {
             DarwinPrintBanner();
             exit(0);
         }
-- 
1.7.0.4