diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-06-03 18:59:04 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-04 00:23:11 -0700 |
| commit | d163266692235261e1e0cfa6b900f54e6ec63de5 (patch) | |
| tree | e0e7d93b6257ae5f1ca59fb6bc404ce0b8256588 /hw/xfree86/parser | |
| parent | 01c75522b6ed15e979347acd38e234e2cb9006c3 (diff) | |
Stop searching for XF86Config files
xorg.conf has been used since the X11R6.7 release in April 2004.
6 years has been a generous transition period for users to
"mv XF86Config xorg.conf" and for distros to update their
configuration tools and packages.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/xfree86/parser')
| -rw-r--r-- | hw/xfree86/parser/scan.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index 9771913f4..52e80a961 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -626,7 +626,6 @@ xf86pathIsSafe(const char *path) #ifndef XCONFENV #define XCONFENV "XORGCONFIG" #endif -#define XFREE86CFGFILE "XF86Config" /* xorg.conf is based on XF86Config version 4. If we ever break compatibility of the xorg.conf syntax, we'll bump this version number. */ #ifndef CONFIG_FILE_VERSION @@ -988,11 +987,8 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot) if (!projroot || !projroot[0]) projroot = PROJECTROOT; - /* Search for a config file or a fallback */ + /* Search for a config file */ configPath = OpenConfigFile(path, cmdline, projroot, XCONFIGFILE); - if (!configPath) - configPath = OpenConfigFile(path, cmdline, projroot, - XFREE86CFGFILE); return configPath; } |