[svn-upgrade] Integrating new upstream version, ion3 (20070203)

[ion3.git] / ion / ion.c

diff --git a/ion/ion.c b/ion/ion.c
index 93a59776a7ef8a5b7fcd4a5e0d9cda17388a0430..1c7fcf97dcda3faca0591fb6794cea169907453c 100644 (file)
--- a/ion/ion.c
+++ b/ion/ion.c
@@ -1,7 +1,7 @@
 /*
  * ion/ion/ion.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
  * Ion is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by
@@ -48,16 +48,8 @@ static OptParserOpt ion_opts[]={
      DUMMY_TR("Add directory to search path")},
 
     {OPT_ID('o'), "oneroot",  0, NULL,
-     DUMMY_TR("Manage default root window/non-Xinerama screen only")},
+     DUMMY_TR("Manage default screen only")},
 
-#if defined(CF_XINERAMA) || defined(CF_SUN_XINERAMA)
-    {OPT_ID('x'), "xinerama", OPT_ARG, "1|0", 
-     DUMMY_TR("Use Xinerama screen information (default: 1/yes)")},
-#else
-    {OPT_ID('x'), "xinerama", OPT_ARG, "?", 
-     DUMMY_TR("Ignored: not compiled with Xinerama support")},
-#endif
-    
     {OPT_ID('s'), "session",  OPT_ARG, "session_name", 
      DUMMY_TR("Name of session (affects savefiles)")},
     
@@ -189,17 +181,6 @@ int main(int argc, char*argv[])
         case OPT_ID('o'):
             stflags|=IONCORE_STARTUP_ONEROOT;
             break;
-        case OPT_ID('x'):
-            {
-                const char *p=optparser_get_arg();
-                if(strcmp(p, "1")==0)
-                    stflags&=~IONCORE_STARTUP_NOXINERAMA;
-                else if(strcmp(p, "0")==0)
-                    stflags|=IONCORE_STARTUP_NOXINERAMA;
-                else
-                    warn(TR("Invalid parameter to -xinerama."));
-            }
-            break;
         case OPT_ID('s'):
             extl_set_sessiondir(optparser_get_arg());
             break;